Merge branch 'develop' of http://git.dashitech.com/seimin/zy-pc

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

@@ -0,0 +1,114 @@
+<div class="content drugPage" id="dictionary">
+  <div class="contentInner">
+    <div class="address">
+      <overlay-scrollbars #osComponentRef1 class="contentBody">
+        <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.value === activeDictionary.value }" (click)="clickDictionaryKey(item)" *ngFor="let item of dictionaryKeyList">{{ item.name }}</div>
+      </overlay-scrollbars>
+    </div>
+    <div class="addressAssign">
+      <div class="contentBody2">
+        <div class="TaskTypeManagement">
+          <div class="taskTypeInfo">
+            <div class="top">
+              <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+                特性配置
+              </div>
+              <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+                自动建单配置
+              </div>
+            </div>
+            <ng-container *ngFor="let item of dictionaryKeyList">
+              <div class="list" *ngIf="!loading && activeDictionary.value === item.value">
+                <!-- 特性配置 -->
+                <div *ngIf="tabModalName=='characteristics'">
+                  <!-- 工单模式 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label" nzRequired>工单模式</nz-form-label>
+                    <nz-radio-group [(ngModel)]="item.postData.drugsModel">
+                      <label nz-radio [nzValue]="item.value" *ngFor="let item of drugsModelList">{{ item.label }}</label>
+                    </nz-radio-group>
+                  </div>
+                  <!-- 支持建单并签到 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">支持建单并签到</nz-form-label>
+                    <nz-checkbox-group [(ngModel)]="item.postData.drugsCreateSign"></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.drugsReceiveSign"></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.drugsStartCheck" (ngModelChange)="changeDrugsStartCheck($event)"></nz-checkbox-group>
+                  </div>
+                  <ng-container *ngIf="item.postData.drugsStartCheck[0].checked">
+                    <!-- 核对方式 -->
+                    <div class="display_flex align-items_center mb8">
+                      <nz-form-label class="label" nzRequired>核对方式</nz-form-label>
+                      <nz-checkbox-group [(ngModel)]="item.postData.drugsStartCheckScanIds"></nz-checkbox-group>
+                    </div>
+                    <!-- 手动填写 -->
+                    <div class="display_flex align-items_center mb8">
+                      <nz-form-label class="label">手动填写</nz-form-label>
+                      <nz-select class="w320px" nzPlaceHolder="请选择手动填写" [(ngModel)]="item.postData.drugsStartManual" nzAllowClear>
+                        <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
+                      </nz-select>
+                    </div>
+                    <!-- 支持拍照留存 -->
+                    <div class="display_flex align-items_center mb8">
+                      <nz-form-label class="label">支持拍照留存</nz-form-label>
+                      <nz-checkbox-group [(ngModel)]="item.postData.drugsStartPhoto"></nz-checkbox-group>
+                    </div>
+                  </ng-container>
+
+                  <!-- 终点科室支持核对 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">终点科室支持核对</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">
+                    <!-- 核对方式 -->
+                    <div class="display_flex align-items_center mb8">
+                      <nz-form-label class="label" nzRequired>核对方式</nz-form-label>
+                      <nz-checkbox-group [(ngModel)]="item.postData.drugsEndCheckScanIds"></nz-checkbox-group>
+                    </div>
+                    <!-- 手动填写 -->
+                    <div class="display_flex align-items_center mb8">
+                      <nz-form-label class="label">手动填写</nz-form-label>
+                      <nz-select class="w320px" nzPlaceHolder="请选择手动填写" [(ngModel)]="item.postData.drugsEndManual" nzAllowClear>
+                        <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
+                      </nz-select>
+                    </div>
+                    <!-- 支持拍照留存 -->
+                    <div class="display_flex align-items_center mb8">
+                      <nz-form-label class="label">支持拍照留存</nz-form-label>
+                      <nz-checkbox-group [(ngModel)]="item.postData.drugsEndPhoto"></nz-checkbox-group>
+                    </div>
+                  </ng-container>
+                </div>
+                <!-- 自动建单配置 -->
+                <div *ngIf="tabModalName=='automaticOrderCreation'">
+                  <!-- 自动建单 -->
+                </div>
+                <div class="bottom">
+                  <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+                </div>
+              </div>
+            </ng-container>
+            <div class="list" *ngIf="loading">
+              <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+                <div class="loadingFullInner">
+                  <img src="../../../assets/images/loading.gif" alt="">
+                  <div>加载中...</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,858 @@
+@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;
+  }
+  #dictionary{
+    margin: 24px 16px;
+    .addressAssign{
+      flex: 7;
+    }
+    .contentItem{
+      margin: 0 16px;
+      padding: 8px;
+      text-align: center;
+      &.active{
+        background-color: @primary-color;
+        color: #fff;
+        border-radius: 4px;
+      }
+    }
+    .contentBody{
+      padding: 16px;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+    }
+    .contentBody2{
+      flex: 1;
+    }
+    ::ng-deep .ant-form-item{
+      margin-bottom: 0;
+    }
+    .dictionaryRow{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 16px;
+      .orders{
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+      }
+      .name{
+        width: 100px;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+      }
+      .value{
+        flex: 3;
+        display: flex;
+        align-items: center;
+        .valueInput{
+          width: 600px;
+        }
+        .icon_transport{
+          font-size: 20px;
+          color: #8a8a8a;
+          cursor: pointer;
+        }
+      }
+
+    }
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      margin: 24px 118px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 48px 206px;
+        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 {
+        margin-bottom: 16px;
+        .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;
+    }
+  }
+  .TaskTypeManagement {
+    height: calc(100vh - 136px);
+    background: #f9fafb;
+    overflow: hidden;
+    padding: 16px 20px;
+
+    .pagination {
+      margin-top: 14px;
+      margin-bottom: 14px;
+      bottom: 12px;
+      right: 5px;
+    }
+
+    .taskType {
+      float: left;
+      width: 24%;
+      height: 100%;
+      border: 1px solid #e5e9ed;
+      background: #fff;
+      color: #333;
+      font-size: 14px;
+      position: relative;
+      overflow: hidden;
+
+      .title {
+        width: 100%;
+        height: 40px;
+        line-height: 40px;
+        padding-left: 16px;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        background: #fff;
+        z-index: 2;
+      }
+
+      .operate {
+        width: 100%;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        background: #fff;
+        z-index: 2;
+        display: flex;
+
+        .item {
+          flex: 1;
+          height: 34px;
+          line-height: 34px;
+          border-right: 1px solid #e5e9ed;
+          text-align: center;
+          color: #666; // cursor: default;
+          cursor: pointer;
+
+          &:hover {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+
+          &:nth-last-child(1) {
+            border: none;
+          }
+        }
+      }
+
+      .taskTypes {
+        // width: 110%;
+        width: 100%;
+        height: 92%;
+        // padding-right: 10%;
+        overflow-y: auto;
+        z-index: 1;
+        padding-bottom: 30px;
+
+        .itemChoice {
+          color: @primary-color;
+          background: #f0f6ed;
+        }
+
+        .item {
+          width: 100%;
+          height: 34px;
+          line-height: 34px;
+          text-align: center;
+          cursor: pointer;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+
+          &:hover {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+
+          &.checked {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+        }
+      }
+    }
+
+    //任务类型管理-主体
+    .taskTypeInfo {
+      height: 100%;
+      border: 1px solid #e5e9ed;
+      background: #fff;
+      color: #333;
+      position: relative;
+
+      .top {
+        height: 61px;
+        line-height: 60px;
+        display: flex;
+        align-items: center;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        z-index: 2;
+
+        .items {
+          background: #f0f6ed;
+        }
+
+        & > div {
+          border-right: 1px solid #e5e9ed;
+          width: 30%;
+          text-align: center; // display: flex;
+          // align-items: center;
+          cursor: pointer;
+
+          &:hover {
+            background: #f0f6ed;
+          }
+        }
+
+        &:nth-last-child(4) {
+          border: none;
+        }
+      }
+
+      .list {
+        width: 100%; // height: 100%;
+        padding: 16px; // position: absolute;
+        // top: 0;
+        // padding-top: 90px;
+        background: #fff;
+        height: 89%;
+        overflow: auto;
+
+        nz-form-label {
+          margin-left: 0px !important;
+        }
+
+        & > div {
+          background: #f9fafb;
+          border: 1px solid #e5e9ed;
+          border-radius: 10px 10px 0px 0px;
+          padding: 24px 120px;
+
+          .label {
+            margin-left: 16px;
+            font-size: 14px;
+            color: #333;
+          }
+        }
+
+        // 规则信息
+        .ruleList {
+          padding: 15px 15px 0px 15px;
+          background: #fff;
+
+          .table {
+            width: 100%;
+            height: 100%;
+
+            .box {
+              // background: #f9fafb;
+              // border: 1px solid #e5e9ed;
+              border-radius: 5px;
+              position: relative;
+
+              .table_title {
+                font-size: 18px;
+                margin: 14px 0px;
+                text-align: center;
+              }
+
+              .thead {
+                background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+                th {
+                  background: transparent;
+                  color: #fff;
+                  text-align: center;
+                  font-size: 14px;
+                }
+              }
+
+              .ant-table-body {
+                border-bottom: 1px solid #e5e9ed;
+                background: #f9fafb;
+              }
+
+              .ant-table-tbody {
+                background: #f9fafb;
+                border: 1px solid #e5e9ed;
+
+                .zzBontton {
+                  & > td {
+                    border-bottom: 1px solid #e5e9ed;
+                  }
+                }
+
+                tr {
+                  text-align: center;
+                  font-size: 14px;
+                  border: none;
+                  color: #333;
+                  overflow: hidden;
+
+                  .lin {
+                    width: 68.2%;
+                    height: 2rem;
+                    border-bottom: 0.1rem solid #e5e9ed;
+                    position: absolute;
+                    text-align: center;
+                    margin-left: 0%;
+                    margin-top: -0.8%;
+                    transform: rotate(6.5deg);
+                  }
+
+                  td {
+                    border: none;
+
+                    nz-input-number {
+                      width: 50px;
+                    }
+
+                    .coop {
+                      .line {
+                        margin: 10px;
+                      }
+
+                      span:nth-child(2n-1) {
+                        cursor: pointer;
+
+                        &:hover {
+                          color: @primary-color;
+                        }
+
+                        &:active {
+                          color: @primary-color;
+                        }
+                      }
+                    }
+                  }
+                }
+
+                tr:nth-child(even) {
+                  background: #fff;
+                }
+              }
+            }
+          }
+        }
+
+        //运送过程
+        .ysgcItem {
+          padding: 0px 0px 0px 0px; // background: #fff;
+
+          .ysgc_top {
+            height: 88px;
+            background: #fff;
+            border-radius: 10px 10px 0px 0px;
+            padding: 15px 22px 0px 22px;
+
+            .title {
+              span {
+                font-size: 18px;
+              }
+            }
+
+            .carrItems {
+              color: @primary-color;
+              border-color: @primary-color !important;
+            }
+
+            .process {
+              width: 80%;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              margin: 5px auto;
+              font-size: 14px;
+
+              .carrItem {
+                height: 40px;
+                line-height: 28px;
+                cursor: pointer;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+
+                .carrItem_icon {
+                  width: 35px;
+                  height: 35px;
+                  border: 1px solid #e5e9ed;
+                  border-radius: 50%;
+                  text-align: center;
+                  line-height: 35px;
+                  margin-right: 10px;
+
+                  i {
+                    font-size: 18px;
+                  }
+                }
+              }
+
+              .carrItem1 {
+                float: left;
+                width: 45%;
+                height: 40px;
+                line-height: 28px;
+                padding-left: 10%;
+                cursor: pointer;
+
+                .carrItem_icon {
+                  width: 35px;
+                  height: 35px;
+                  border: 1px solid #e5e9ed;
+                  border-radius: 50%;
+                  text-align: center;
+                  line-height: 35px;
+                  float: left;
+                  margin-right: 10px;
+
+                  i {
+                    font-size: 18px;
+                  }
+                }
+              }
+            }
+          }
+
+          .ysgc_cont {
+            padding: 0px 240px 24px 240px;
+
+            textarea {
+              padding-right: 10%;
+            }
+
+            .icon_btn {
+              cursor: pointer;
+              font-size: 18px;
+            }
+
+            .icon_text {
+              display: block;
+              cursor: pointer;
+              position: relative;
+              right: 5px;
+            }
+
+            .item_type_cont {
+              height: 70px;
+              padding-top: 4px;
+
+              & > div {
+                height: 65px;
+                border: 1px solid #e5e9ed;
+                border-radius: 5px;
+                background: #fff;
+
+                .item_type_cont_L {
+                  height: 100%;
+                  width: 90%;
+                  float: left;
+                  padding: 2px 12px;
+                  overflow: auto;
+
+                  .item_yq {
+                    width: 24%;
+                    height: 28px;
+                    display: inline-block;
+                    border: 1px solid #e5e9ed;
+                    border-radius: 20px;
+                    text-align: center;
+                    line-height: 26px;
+                    background: #f9fafb;
+                    margin-right: 1%;
+                    margin-bottom: 2px;
+                    font-size: 12px;
+                    padding-left: 8px;
+
+                    span {
+                      width: 75%;
+                      float: left;
+                      overflow: hidden;
+                      text-overflow: ellipsis;
+                      white-space: nowrap;
+                    }
+
+                    i {
+                      font-size: 14px;
+                      color: #999;
+                      cursor: pointer;
+                    }
+                  }
+                }
+
+                .item_type_cont_R {
+                  height: 100%;
+                  width: 10%;
+                  float: right;
+                  text-align: center;
+                  padding-top: 15px;
+                  border-left: 1px solid #e5e9ed;
+                  cursor: pointer;
+
+                  i {
+                    display: block;
+                    font-size: 16px;
+                  }
+
+                  i:hover {
+                    color: @primary-color;
+                  }
+
+                  .icon_text {
+                    right: 1px;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        //关联信息
+        .glxxItem {
+          padding: 10px 15px 0px 15px;
+          background: #fff;
+
+          .tab_btn {
+            cursor: pointer;
+          }
+
+          .tab_btn:hover {
+            color: @primary-color;
+          }
+
+          .table_title {
+            font-size: 18px;
+            margin: 14px 0px;
+            text-align: center;
+          }
+
+          .thead {
+            background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+            th {
+              background: transparent;
+              color: #fff;
+              text-align: center;
+              font-size: 14px;
+            }
+          }
+
+          .ant-table-body {
+            // border-bottom: 1px solid #e5e9ed;
+            background: #f9fafb;
+          }
+
+          .ant-table-tbody {
+            background: #f9fafb;
+            border: 1px solid #e5e9ed;
+
+            tr {
+              text-align: center;
+              font-size: 14px;
+              border: none;
+              color: #333;
+
+              td {
+                border: none; // font-size: 14px;
+
+                nz-input-number {
+                  width: 40px;
+                }
+
+                .coop {
+                  .line {
+                    margin: 10px;
+                  }
+
+                  span:nth-child(2n-1) {
+                    cursor: pointer;
+
+                    &:hover {
+                      color: @primary-color;
+                    }
+
+                    &:active {
+                      color: @primary-color;
+                    }
+                  }
+                }
+              }
+            }
+
+            tr:nth-child(even) {
+              background: #fff;
+            }
+          }
+        }
+
+        // 开通科室
+        .ktksItem {
+          padding: 0px 0px 0px 0px;
+          background: #fff;
+
+          .top {
+            width: 100%; // padding-bottom: 7px;
+            // border-bottom: 1px solid #e5e9ed;
+            position: relative;
+            overflow: hidden;
+            z-index: 2;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .top_L {
+              width: 70%;
+              text-align: left;
+              display: flex;
+              flex-wrap: wrap;
+              align-items: center;
+              padding: 0 4px;
+              .top_L_item {
+                margin-left: 4px;
+              }
+
+              .label {
+                font-size: 14px;
+                color: #333;
+                margin-left: 0;
+              }
+
+              nz-select {
+                font-size: 12px;
+                width: 100px;
+              }
+
+              input {
+                font-size: 12px;
+                width: 100px;
+              }
+            }
+
+            .top_R {
+              border: 0px;
+
+              .btn {
+                margin-left: 10px;
+              }
+            }
+          }
+
+          .ktksItemList {
+            padding: 10px 15px 0px 15px;
+            .table {
+              min-height: 528px;
+            }
+
+            .operate {
+              float: right;
+              margin-bottom: 5px;
+
+              span {
+                font-size: 14px;
+              }
+
+              .num {
+                font-size: 18px;
+                color: @primary-color;
+              }
+            }
+
+            .thead {
+              background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+              th {
+                background: transparent;
+                color: #fff;
+                text-align: center;
+                font-size: 14px;
+              }
+            }
+
+            .ant-table-body {
+              border-bottom: 1px solid #e5e9ed;
+              background: #f9fafb;
+            }
+
+            .ant-table-tbody {
+              background: #f9fafb;
+              border: 1px solid #e5e9ed;
+
+              .zzBontton {
+                & > td {
+                  border-bottom: 1px solid #e5e9ed;
+                }
+              }
+
+              tr {
+                text-align: center;
+                font-size: 14px;
+                border: none;
+                color: #333;
+
+                td {
+                  border: none; // font-size: 14px;
+
+                  nz-input-number {
+                    width: 40px;
+                  }
+
+                  .coop {
+                    .line {
+                      margin: 10px;
+                    }
+
+                    span:nth-child(2n-1) {
+                      cursor: pointer;
+
+                      &:hover {
+                        color: @primary-color;
+                      }
+
+                      &:active {
+                        color: @primary-color;
+                      }
+                    }
+                  }
+                }
+              }
+
+              tr:nth-child(even) {
+                background: #fff;
+              }
+            }
+          }
+
+          .pagination {
+            margin-top: 25px;
+            margin-bottom: 14px;
+            bottom: 12px;
+            right: 5px;
+            position: relative;
+            height: 30px;
+            .page {
+              position: absolute;
+              right: 5px;
+            }
+          }
+        }
+
+        .bottom {
+          height: 60px;
+          border-radius: 0px 0px 10px 10px;
+          padding: 10px 240px 0px 240px;
+          border-top: 0px;
+
+          button {
+            width: 80px;
+            height: 34px;
+            display: block;
+            margin: 0 auto;
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,300 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { MainService } from "../../../services/main.service";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject, forkJoin } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+
+@Component({
+  selector: "app-configuration-drug",
+  templateUrl: "./configuration-drug.component.html",
+  styleUrls: ["./configuration-drug.component.less"],
+})
+export class ConfigurationDrugComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+
+  loading:boolean = false; //页面加载的loading
+  btnLoading:boolean = false; //提交按钮的loading
+  tabModalName:string = 'characteristics'; //当前选中的tab
+  hosId = this.tool.getCurrentHospital().id; //当前院区
+
+  // 配置
+  configs:any = {};
+  // 任务类型
+  tasktype:any = {};
+  constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
+
+  ngOnInit():void {
+    this.activeDictionary = this.dictionaryKeyList[0];
+    this.init();
+  }
+
+  // 工单模式
+  drugsModelList:any[] = [
+    { label: '一单一码', value: 1 },
+    { label: '一单多码', value: 2 },
+  ];
+
+  // 手动填写
+  drugsManualList:any[] = [];
+
+  // 数据字典key列表
+  dictionaryKeyList: any[] = [
+    {
+      name: '静配',
+      value: 'drugsJpbag',
+      postData: {
+        drugsModel: undefined,//工单模式
+        drugsCreateSign: [{ label:'是否开启', value: 0 }],//支持建单并签到
+        drugsReceiveSign: [{ label:'是否开启', value: 0 }],//支持接单并签到
+        drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
+        drugsStartCheckScanIds: [],//起点核对方式
+        drugsStartManual: undefined,//起点科室手动填写
+        drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
+        drugsEndCheck: [{ label:'是否开启', value: 0 }],//终点科室支持核对
+        drugsEndCheckScanIds: [],//终点核对方式
+        drugsEndManual: undefined,//终点科室手动填写
+        drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+      }
+    },
+    {
+      name: '西药',
+      value: 'drugsWestern',
+      postData: {
+        drugsModel: undefined,//工单模式
+        drugsCreateSign: [{ label:'是否开启', value: 0 }],//支持建单并签到
+        drugsReceiveSign: [{ label:'是否开启', value: 0 }],//支持接单并签到
+        drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
+        drugsStartCheckScanIds: [],//起点核对方式
+        drugsStartManual: undefined,//起点科室手动填写
+        drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
+        drugsEndCheck: [{ label:'是否开启', value: 0 }],//终点科室支持核对
+        drugsEndCheckScanIds: [],//终点核对方式
+        drugsEndManual: undefined,//终点科室手动填写
+        drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+      }
+    },
+    {
+      name: '退药',
+      value: 'drugsReturn',
+      postData: {
+        drugsModel: undefined,//工单模式
+        drugsCreateSign: [{ label:'是否开启', value: 0 }],//支持建单并签到
+        drugsReceiveSign: [{ label:'是否开启', value: 0 }],//支持接单并签到
+        drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
+        drugsStartCheckScanIds: [],//起点核对方式
+        drugsStartManual: undefined,//起点科室手动填写
+        drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
+        drugsEndCheck: [{ label:'是否开启', value: 0 }],//终点科室支持核对
+        drugsEndCheckScanIds: [],//终点核对方式
+        drugsEndManual: undefined,//终点科室手动填写
+        drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+      }
+    },
+    {
+      name: '毒麻',
+      value: 'drugsPoison',
+      postData: {
+        drugsModel: undefined,//工单模式
+        drugsCreateSign: [{ label:'是否开启', value: 0 }],//支持建单并签到
+        drugsReceiveSign: [{ label:'是否开启', value: 0 }],//支持接单并签到
+        drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
+        drugsStartCheckScanIds: [],//起点核对方式
+        drugsStartManual: undefined,//起点科室手动填写
+        drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
+        drugsEndCheck: [{ label:'是否开启', value: 0 }],//终点科室支持核对
+        drugsEndCheckScanIds: [],//终点核对方式
+        drugsEndManual: undefined,//终点科室手动填写
+        drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+      }
+    },
+    {
+      name: '中草药',
+      value: 'drugsHerbal',
+      postData: {
+        drugsModel: undefined,//工单模式
+        drugsCreateSign: [{ label:'是否开启', value: 0 }],//支持建单并签到
+        drugsReceiveSign: [{ label:'是否开启', value: 0 }],//支持接单并签到
+        drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
+        drugsStartCheckScanIds: [],//起点核对方式
+        drugsStartManual: undefined,//起点科室手动填写
+        drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
+        drugsEndCheck: [{ label:'是否开启', value: 0 }],//终点科室支持核对
+        drugsEndCheckScanIds: [],//终点核对方式
+        drugsEndManual: undefined,//终点科室手动填写
+        drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+      }
+    },
+  ];
+
+  // 点击数据字典key
+  activeDictionary:any;
+  clickDictionaryKey(item){
+    this.activeDictionary = item;
+    this.init();
+  }
+
+  // 修改起点科室支持核对
+  changeDrugsStartCheck(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.activeDictionary.postData.drugsStartCheckScanIds = this.activeDictionary.postData.drugsStartCheckScanIds.map(v => ({...v, checked: false}));
+      this.activeDictionary.postData.drugsStartManual = undefined;
+      this.activeDictionary.postData.drugsStartPhoto[0].checked = false;
+    }
+  }
+
+  // 修改终点科室支持核对
+  changeDrugsEndCheck(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.activeDictionary.postData.drugsEndCheckScanIds = this.activeDictionary.postData.drugsEndCheckScanIds.map(v => ({...v, checked: false}));;
+      this.activeDictionary.postData.drugsEndManual = undefined;
+      this.activeDictionary.postData.drugsEndPhoto[0].checked = false;
+    }
+  }
+
+  // 切换tab
+  tabModal(tabModalName:string){
+    this.tabModalName = tabModalName;
+  }
+  // 保存
+  submitForm() {
+    if(!this.tasktype.id){
+      this.msg.create("warning", "请先配置任务类型！");
+      return;
+    }
+
+    if(!this.activeDictionary.postData.drugsModel){
+      this.msg.create("warning", "请选择工单模式！");
+      return;
+    }
+
+    if(this.activeDictionary.postData.drugsStartCheck[0].checked && !this.activeDictionary.postData.drugsStartCheckScanIds.length){
+      this.msg.create("warning", "请选择起点科室的核对方式！");
+      return;
+    }
+
+    if(this.activeDictionary.postData.drugsEndCheck[0].checked && !this.activeDictionary.postData.drugsEndCheckScanIds.length){
+      this.msg.create("warning", "请选择终点科室的核对方式！");
+      return;
+    }
+
+    let postData:any = {
+      id: this.configs.id,
+      taskType: this.tasktype.id,
+      hosId: this.hosId,
+      drugsModel: this.activeDictionary.postData.drugsModel || undefined,
+      drugsCreateSign: this.activeDictionary.postData.drugsCreateSign[0].checked ? 1 : 0,
+      drugsReceiveSign: this.activeDictionary.postData.drugsReceiveSign[0].checked ? 1 : 0,
+      drugsStartCheck: this.activeDictionary.postData.drugsStartCheck[0].checked ? 1 : 0,
+      drugsStartCheckScanIds: this.activeDictionary.postData.drugsStartCheckScanIds.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      drugsStartManual: this.activeDictionary.postData.drugsStartManual ? { id: this.activeDictionary.postData.drugsStartManual } : undefined,
+      drugsStartPhoto: this.activeDictionary.postData.drugsStartPhoto[0].checked ? 1 : 0,
+      drugsEndCheck: this.activeDictionary.postData.drugsEndCheck[0].checked ? 1 : 0,
+      drugsEndCheckScanIds: this.activeDictionary.postData.drugsEndCheckScanIds.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      drugsEndManual: this.activeDictionary.postData.drugsEndManual ? { id: this.activeDictionary.postData.drugsEndManual } : undefined,
+      drugsEndPhoto: this.activeDictionary.postData.drugsEndPhoto[0].checked ? 1 : 0,
+    };
+    this.btnLoading = true;
+    this.mainService
+      .simplePost("addData", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.getConfig();
+        }
+      });
+  }
+
+  //初始化
+  init() {
+    this.loading = true;
+    let drugs_bag_check_scan_type$ = this.mainService.getDictionary('list', 'drugs_bag_check_scan_type', true);
+    let drugs_bag_manual_type$ = this.mainService.getDictionary('list', 'drugs_bag_manual_type', true);
+    forkJoin(drugs_bag_check_scan_type$, drugs_bag_manual_type$).subscribe((data:any[]) => {
+      let drugs_bag_check_scan_type = data[0] || [];
+      let drugs_bag_manual_type = data[1] || [];
+
+      this.activeDictionary.postData.drugsStartCheckScanIds = drugs_bag_check_scan_type.map(v => ({ label:v.name, value: v.id }));
+      this.activeDictionary.postData.drugsEndCheckScanIds = drugs_bag_check_scan_type.map(v => ({ label:v.name, value: v.id }));
+      this.drugsManualList = drugs_bag_manual_type.map(v => ({ label:v.name, value: v.id }));
+
+      this.getTaskType();
+    })
+  }
+
+  //获取任务类型
+  getTaskType() {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 1,
+      taskType: {
+        simpleQuery: true,
+        hosId: {
+          id: this.hosId
+        },
+        ordinaryField: {
+          key: 'ordinary_field',
+          value: this.activeDictionary.value,
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskType", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        if (result.status == 200) {
+          this.tasktype = result.list[0] || {};
+          this.getConfig();
+        }
+      });
+  }
+
+  // 获取配置
+  getConfig() {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 1,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key: 'ordinary_field',
+            value: this.activeDictionary.value,
+          }
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        if (result.status == 200) {
+          this.configs = result.list[0] || {};
+          this.activeDictionary.postData.drugsModel = this.configs.drugsModel || undefined;
+          this.activeDictionary.postData.drugsCreateSign[0].checked = this.configs.drugsCreateSign == 1;
+          this.activeDictionary.postData.drugsReceiveSign[0].checked = this.configs.drugsReceiveSign == 1;
+
+          this.activeDictionary.postData.drugsStartCheck[0].checked = this.configs.drugsStartCheck == 1;
+          this.activeDictionary.postData.drugsStartCheckScanIds = this.activeDictionary.postData.drugsStartCheckScanIds.map(v => ({...v, checked: (this.configs.drugsStartCheckScanIds || '').split(',').includes(v.value.toString())}));
+          this.activeDictionary.postData.drugsStartManual = this.configs.drugsStartManual ? this.configs.drugsStartManual.id : undefined;
+          this.activeDictionary.postData.drugsStartPhoto[0].checked = this.configs.drugsStartPhoto == 1;
+
+          this.activeDictionary.postData.drugsEndCheck[0].checked = this.configs.drugsEndCheck == 1;
+          this.activeDictionary.postData.drugsEndCheckScanIds = this.activeDictionary.postData.drugsEndCheckScanIds.map(v => ({...v, checked: (this.configs.drugsEndCheckScanIds || '').split(',').includes(v.value.toString())}));
+          this.activeDictionary.postData.drugsEndManual = this.configs.drugsEndManual ? this.configs.drugsEndManual.id : undefined;
+          this.activeDictionary.postData.drugsEndPhoto[0].checked = this.configs.drugsEndPhoto == 1;
+        }
+      });
+  }
+}

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

@@ -216,6 +216,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 
   //获取任务类型
   getTaskType() {
+    this.loading = true;
     let postData = {
       idx: 0,
       sum: 10,
@@ -233,6 +234,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
     this.mainService
       .getFetchDataList("simple/data", "taskType", postData)
       .subscribe((result) => {
+        this.loading = false;
         if (result.status == 200) {
           this.tasktype = result.list[0] || {};
           this.getConfig();

src/app/components/order-scope/order-scope.component.ts

@@ -131,7 +131,7 @@ export class OrderScopeComponent implements OnInit {
       this.hosList = hospitals.filter(v => !this.tool.isDuty(v));
       this.taskTypes = this.user.infoPermission.taskTypes || [];
       let userGroups = this.user.infoPermission.groups || [];
-      this.userGroups = this.user.infoPermission.groups.filter(v => v.type !== 3);
+      this.userGroups = userGroups.filter(v => v.type !== 3);
       this.hosList.forEach((e) => {
         let arrT = [],
           arrG = [];

src/app/share/businessData-detail-info-modal/businessData-detail-info-modal.component.html

@@ -0,0 +1,46 @@
+<div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
+  <div class="modalBody" style="width: 1200px;">
+    <div class="title" *ngIf="(type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal');else elseTpl">药品详情<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <ng-template #elseTpl>
+      <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    </ng-template>
+    <div class="drugsBag" *ngIf="type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal'">
+      <div>单号：{{drugsBag.batchNo}}</div>
+      <div>申请科室：{{drugsBag.target ? drugsBag.target.dept : ''}}</div>
+      <div>发药科室：{{drugsBag.launch ? drugsBag.launch.dept : ''}}</div>
+    </div>
+    <div class="content">
+      <ng-container *ngIf="type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal'">
+        <!-- 新药品 -->
+        <nz-table class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
+          [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+          <thead>
+            <tr class="thead">
+              <th nzWidth="5%">序号</th>
+              <th nzWidth="85%">药品名称+规格</th>
+              <th nzWidth="10%">数量</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of drugsBugSingleList;let i = index;">
+              <td>{{i+1}}</td>
+              <td>{{ data.drugsInfo }} {{ data.model }}</td>
+              <td>{{ data.drugsNum }}</td>
+            </tr>
+          </tbody>
+        </nz-table>
+      </ng-container>
+
+      <div class="pagination" *ngIf="type !== 'drugsJpbag' && type !== 'drugsWestern' && type !== 'drugsReturn' && type !== 'drugsPoison' && type !== 'drugsHerbal'">
+        <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
+          [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
+          (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+    </div>
+  </div>
+</div>

src/app/share/businessData-detail-info-modal/businessData-detail-info-modal.component.less

@@ -0,0 +1,211 @@
+@import "../../../../src/theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .drugsBag{
+    display: flex;
+    align-items: center;
+    font-size: 16px;
+    gap: 40px;
+    padding: 16px 24px 0;
+    border-top: 1px solid #E8EBEF;
+  }
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .tab {
+    width: 100%;
+    height: 60px;
+    border-bottom: 1px solid #e5e9ed;
+    background-color: #fff;
+
+    .item {
+      text-align: center;
+      line-height: 60px;
+      height: 100%;
+      border-right: 1px solid #e5e9ed;
+
+      &:nth-last-child(1) {
+        border: none;
+      }
+
+      &.checked {
+        background: #f0f6ed;
+      }
+    }
+  }
+
+  .modalBody {
+    width: 700px;
+    background: #fff;
+    border-radius: 5px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      height: 53px;
+      line-height: 53px;
+      border-bottom: 1px solid #E8EBEF;
+      padding: 0 28px;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 28px;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin: 16px 24px 0;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+      margin-bottom: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/businessData-detail-info-modal/businessData-detail-info-modal.component.ts

@@ -0,0 +1,137 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+@Component({
+  selector: 'app-businessData-detail-info-modal',
+  templateUrl: './businessData-detail-info-modal.component.html',
+  styleUrls: ['./businessData-detail-info-modal.component.less']
+})
+export class BusinessDataDetailInfoModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  hosId;
+  hsLoading = false;
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 10;//表格每页展示条数
+  total: number = 0;//表格总数据量
+  searchCriteria:any = {
+    stype: 0,
+    specimenDesc: 0,
+  }
+  @Input() show: Boolean;
+  @Input() infoId: String;
+  @Input() type: String = '';
+  @Input() dataInfo: any;
+
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) { }
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    switch(this.type){
+      case 'drugsJpbag':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsWestern':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsReturn':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsPoison':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsHerbal':
+        this.getNewDrugConfig(1);
+        break;
+
+    }
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 分页获取数据
+  getList(){
+    switch(this.type){
+      case 'drugsJpbag':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsWestern':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsReturn':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsPoison':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsHerbal':
+        this.getDrugsBugList(1);
+        break;
+    }
+  }
+
+  // 获取新药品一单一码列表
+  drugsBugSingleList: any = [];// 药品列表
+  drugsBag:any = {};// 药包
+  getDrugsBugSingle(drugsBagId) {
+    let postData = {
+      type: this.type,
+      extraType: 'drugsInfo',
+      drugsBagId,
+    }
+    this.hsLoading = true;
+    this.mainService.transflow(postData, 'extra').subscribe(res => {
+      this.hsLoading = false;
+      if(res.state == 200){
+        if(res.data){
+          this.drugsBugSingleList = res.data.drugsList || [];
+          this.drugsBag = res.data.drugsBag || {};
+        }
+      }
+    })
+  }
+
+  // 获取新药品列表
+  getDrugsBugList(idx?){
+    this.getDrugsBugSingle(this.infoId);
+  }
+
+  // 获取新药品配置
+  configs:any = {};
+  getNewDrugConfig(idx?) {
+    this.hsLoading = true;
+    let postData = {
+      idx: 0,
+      sum: 1,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key: 'ordinary_field',
+            value: this.type,
+          }
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          let list = result.list || [];
+          this.configs = list[0] || {};
+          this.getDrugsBugList(idx);
+        }else{
+          this.hsLoading = false;
+        }
+      });
+  }
+
+}
+
+
+

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -1,6 +1,14 @@
 <div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
   <div class="modalBody" style="width: 1200px;">
-    <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title" *ngIf="(type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal');else elseTpl">药品详情<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <ng-template #elseTpl>
+      <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    </ng-template>
+    <div class="drugsBag" *ngIf="configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')">
+      <div>单号：{{drugsBag.batchNo}}</div>
+      <div>申请科室：{{drugsBag.target ? drugsBag.target.dept : ''}}</div>
+      <div>发药科室：{{drugsBag.launch ? drugsBag.launch.dept : ''}}</div>
+    </div>
     <div class="content">
       <!-- 血制品 -->
       <nz-table *ngIf="type === 'blood'" class="hospitalTable" [nzData]="bloodList" nzSize="middle" [nzShowPagination]="false"
@@ -32,6 +40,56 @@
           </tr>
         </tbody>
       </nz-table>
+      <!-- 新药品-一单一码 -->
+      <nz-table *ngIf="configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="5%">序号</th>
+            <th nzWidth="85%">药品名称+规格</th>
+            <th nzWidth="10%">数量</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of drugsBugSingleList;let i = index;">
+            <td>{{i+1}}</td>
+            <td>{{ data.drugsInfo }} {{ data.model }}</td>
+            <td>{{ data.drugsNum }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <!-- 新药品-一单多码 -->
+      <nz-table *ngIf="configs.drugsModel === 2 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugMultipleList" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="5%">序号</th>
+            <th nzWidth="11%">单号</th>
+            <th nzWidth="8%">种类数</th>
+            <th nzWidth="8%">总数</th>
+            <th nzWidth="10%">收取人</th>
+            <th nzWidth="10%">收取交接人</th>
+            <th nzWidth="14%">收取时间</th>
+            <th nzWidth="10%">送达人</th>
+            <th nzWidth="14%">送达交接人</th>
+            <th nzWidth="10%">送达时间</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of drugsBugMultipleList;let i = index;" (click)="viewDetail(type, data.id)">
+            <td>{{i+1}}</td>
+            <td>{{ data.batchNo }}</td>
+            <td>{{ data.drugsTypeCount }}</td>
+            <td>{{ data.drugsCount }}</td>
+            <td><ng-container *ngIf="handoverStartObj">{{handoverStartObj.username}}</ng-container></td>
+            <td><ng-container *ngIf="handoverStartObj && handoverStartObj.handoverUserid">{{handoverStartObj.handoverUserid.name}}</ng-container></td>
+            <td><ng-container *ngIf="handoverStartObj">{{handoverStartObj.operationTime}}</ng-container></td>
+            <td><ng-container *ngIf="handoverEndObj">{{handoverEndObj.username}}</ng-container></td>
+            <td><ng-container *ngIf="handoverEndObj && handoverEndObj.handoverUserid">{{handoverEndObj.handoverUserid.name}}</ng-container></td>
+            <td><ng-container *ngIf="handoverEndObj">{{handoverEndObj.operationTime}}</ng-container></td>
+          </tr>
+        </tbody>
+      </nz-table>
       <!-- 标本 -->
       <div class="list-template w100" *ngIf="type === 'specimen'">
         <div class="list-template__content">
@@ -155,7 +213,7 @@
         </tbody>
       </nz-table>
 
-      <div class="pagination" *ngIf="type !== 'blood'">
+      <div class="pagination" *ngIf="type !== 'blood' && type !== 'drugsJpbag' && type !== 'drugsWestern' && type !== 'drugsReturn' && type !== 'drugsPoison' && type !== 'drugsHerbal'">
         <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
         <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
           [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
@@ -168,3 +226,12 @@
     </div>
   </div>
 </div>
+
+<!-- 业务数据-二级信息查看 -->
+<app-businessData-detail-info-modal
+  *ngIf="businessDataModalShow"
+  [show]="businessDataModalShow"
+  [type]="businessDataModalType"
+  [infoId]="infoId"
+  (closeModelHs)="closeModelBlood($event)"
+></app-businessData-detail-info-modal>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.less

@@ -7,6 +7,14 @@
   height: 100%;
   background: rgba(0, 0, 0, 0.4);
   z-index: 999;
+  .drugsBag{
+    display: flex;
+    align-items: center;
+    font-size: 16px;
+    gap: 40px;
+    padding: 16px 24px 0;
+    border-top: 1px solid #E8EBEF;
+  }
   .hospitalTable {
     width: 100%;
     td {
@@ -61,10 +69,8 @@
 
   .modalBody {
     width: 700px;
-    min-height: 220px;
     background: #fff;
     border-radius: 5px;
-    padding: 10px 20px;
     color: #333;
     &.modalBody-search {
       width: 480px;
@@ -73,13 +79,17 @@
 
     .title {
       width: 100%;
+      height: 53px;
+      line-height: 53px;
+      border-bottom: 1px solid #E8EBEF;
+      padding: 0 28px;
       text-align: center;
       font-size: 18px;
       position: relative;
 
       i {
         position: absolute;
-        right: 0;
+        right: 28px;
         top: 0;
         font-size: 20px;
         color: #666;
@@ -89,12 +99,11 @@
     }
 
     .content {
-      min-height: 117px;
       background: #f9fafb;
       border: 1px solid #e5e9ed;
       border-radius: 5px;
       overflow: hidden;
-      margin-top: 12px;
+      margin: 16px 24px 0;
       display: flex;
       flex-direction: column;
       justify-content: center;
@@ -152,6 +161,7 @@
 
     button {
       margin-top: 10px;
+      margin-bottom: 10px;
 
       &.btn {
         margin-left: 8px;

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { MainService } from '../../services/main.service';
 import { ToolService } from 'src/app/services/tool.service';
 import { format, startOfDay, endOfDay } from 'date-fns';
+import { NzMessageService } from 'ng-zorro-antd';
 @Component({
   selector: 'app-businessData-detail-modal',
   templateUrl: './businessData-detail-modal.component.html',
@@ -29,7 +30,11 @@ export class BusinessDataDetailModalComponent implements OnInit {
 
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
-  constructor(private mainService: MainService, private tool: ToolService) { }
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
 
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
@@ -39,19 +44,35 @@ export class BusinessDataDetailModalComponent implements OnInit {
         this.getBlood(1);
         break;
       case 'specimen':
-          this.getSpecimen(1);
-          this.getSpecimenType();
-          this.getSpecimenDesc();
-          break;
+        this.getSpecimen(1);
+        this.getSpecimenType();
+        this.getSpecimenDesc();
+        break;
       case 'deptInspectionRateStatistics':
-          this.getDeptInspectionRateStatistics(1);
-          break;
+        this.getDeptInspectionRateStatistics(1);
+        break;
       case 'deptInspectionStatistics':
         this.getDeptInspectionStatistics(1);
         break;
       case 'washingException':
-          this.getWashingException(1);
-          break;
+        this.getWashingException(1);
+        break;
+      case 'drugsJpbag':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsWestern':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsReturn':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsPoison':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsHerbal':
+        this.getNewDrugConfig(1);
+        break;
+
     }
   }
   // 关闭弹窗
@@ -97,6 +118,21 @@ export class BusinessDataDetailModalComponent implements OnInit {
       case 'washingException':
         this.getWashingException();
         break;
+      case 'drugsJpbag':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsWestern':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsReturn':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsPoison':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsHerbal':
+        this.getDrugsBugList(1);
+        break;
     }
   }
 
@@ -188,6 +224,104 @@ export class BusinessDataDetailModalComponent implements OnInit {
     })
   }
 
+  // 获取新药品一单一码列表
+  drugsBugSingleList: any = [];// 药品列表
+  drugsBag:any = {};// 药包
+  getDrugsBugSingle(drugsBagId) {
+    let postData = {
+      type: this.type,
+      extraType: 'drugsInfo',
+      drugsBagId,
+    }
+    this.hsLoading = true;
+    this.mainService.transflow(postData, 'extra').subscribe(res => {
+      this.hsLoading = false;
+      if(res.state == 200){
+        if(res.data){
+          this.drugsBugSingleList = res.data.drugsList || [];
+          this.drugsBag = res.data.drugsBag || {};
+        }
+      }
+    })
+  }
+
+  // 获取新药品一单多码列表
+  drugsBugMultipleList: any = [];// 药包列表
+  workOrder:any = {};// 工单
+  handoverStartObj:any = {};// 接收人
+  handoverEndObj:any = {};// 送达人
+  getDrugsBugMultiple(idx, drugsModel) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      type: this.type,
+      extraType: 'orderInfo',
+      orderId: this.orderId,
+    }
+    this.hsLoading = true;
+    this.mainService.transflow(postData, 'extra').subscribe(res => {
+      this.hsLoading = false;
+      if(res.state == 200){
+        if(res.data){
+          this.drugsBugMultipleList = res.data.drugsBagList || [];
+          this.workOrder = res.data.workOrder || {};
+          this.total = this.drugsBugMultipleList.length;
+
+          this.handoverStartObj = this.workOrder.record.find(v => v.operation.value == 8);
+          this.handoverEndObj = this.workOrder.record.find(v => v.operation.value == 10);
+
+          if(drugsModel === 1){
+            // 一单一码
+            if(this.drugsBugMultipleList.length){
+              this.getDrugsBugSingle(this.drugsBugMultipleList[0].id);
+            }else{
+              this.message.warning('未查询到药品！')
+            }
+          }
+
+        }
+      }
+    })
+  }
+
+  // 获取新药品列表
+  getDrugsBugList(idx?){
+    this.getDrugsBugMultiple(idx, this.configs.drugsModel);
+  }
+
+  // 获取新药品配置
+  configs:any = {};
+  getNewDrugConfig(idx?) {
+    this.hsLoading = true;
+    let postData = {
+      idx: 0,
+      sum: 1,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key: 'ordinary_field',
+            value: this.type,
+          }
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          let list = result.list || [];
+          this.configs = list[0] || {};
+          this.getDrugsBugList(idx);
+        }else{
+          this.hsLoading = false;
+        }
+      });
+  }
+
   // 获取科室检查率统计-详情列表
   getDeptInspectionRateStatistics(idx?) {
     if (idx) {
@@ -298,6 +432,20 @@ export class BusinessDataDetailModalComponent implements OnInit {
     })
 
   }
+
+  // 查看业务数据
+  businessDataModalShow = false; //业务数据弹窗开关
+  businessDataModalType = ''; //业务数据类型
+  infoId = ''; //业务数据id
+  viewDetail(type, id) {
+    this.infoId = id;
+    this.businessDataModalType = type;
+    this.businessDataModalShow = true;
+  }
+  // 关闭业务数据弹窗
+  closeModelBlood(e) {
+    this.businessDataModalShow = JSON.parse(e).show;
+  }
 }
 
 

src/app/share/order-detail/order-detail.component.html

@@ -1239,6 +1239,9 @@
     <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, 'blood')">
       业务数据
     </button>
+    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && (orderInfo.taskType.ordinaryField.value == 'drugsJpbag' || orderInfo.taskType.ordinaryField.value == 'drugsWestern' || orderInfo.taskType.ordinaryField.value == 'drugsReturn' || orderInfo.taskType.ordinaryField.value == 'drugsPoison' || orderInfo.taskType.ordinaryField.value == 'drugsHerbal')" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, orderInfo.taskType.ordinaryField.value)">
+      业务数据
+    </button>
     <button *ngIf="orderInfo.taskType.associationType.value == 'specimen' || orderInfo.taskType.associationType.value == 'specimenPlan'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, 'specimen')">
       业务数据
     </button>

src/app/share/share.module.ts

@@ -58,6 +58,7 @@ import { StripHtmlPipe } from '../pipes/strip-html.pipe.';
 import { PathologyAddComponent } from './pathology-add/pathology-add.component';
 import { PathologyDetailComponent } from './pathology-detail/pathology-detail.component';
 import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
+import { BusinessDataDetailInfoModalComponent } from './businessData-detail-info-modal/businessData-detail-info-modal.component';
 
 @NgModule({
   declarations: [
@@ -81,6 +82,7 @@ import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
     InspectionAddressTagPromptModalComponent,
     InspectionExecuteAssignPromptModalComponent,
     BusinessDataDetailModalComponent,
+    BusinessDataDetailInfoModalComponent,
     RelationTransDetailModalComponent,
     BxPromptModalComponent,
     AppraiseDetailComponent,
@@ -113,6 +115,7 @@ import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
     SpePromptModalComponent,
     OrderPromptModalComponent,
     BusinessDataDetailModalComponent,
+    BusinessDataDetailInfoModalComponent,
     RelationTransDetailModalComponent,
     DetailOrdinaryComponent,
     BloodHistoryPromptModalComponent,
@@ -148,6 +151,7 @@ import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
     InspectionAddressTagPromptModalComponent,
     InspectionExecuteAssignPromptModalComponent,
     BusinessDataDetailModalComponent,
+    BusinessDataDetailInfoModalComponent,
     RelationTransDetailModalComponent,
     BxPromptModalComponent,
     AppraiseDetailComponent,

src/app/views/page-config/page-config.component.html

@@ -1,7 +1,7 @@
 <div class="incidentConfig">
   <div class="tagsAndTemplete">
     <div class="tags">
-      <div><i class="icon_transport transport-peizhizhongxin"></i>配置中心&emsp;&gt;&emsp;业务页面控制</div>
+      <div><i class="icon_transport transport-peizhizhongxin"></i>配置中心&emsp;&gt;&emsp;业务流程控制</div>
       <div class="tagList">
         <span *ngFor="let tag of tagList" [ngClass]="{ active: activeTagLink === tag.link }" (click)="clickTag(tag)">{{ tag.title }}</span>
       </div>
@@ -12,6 +12,11 @@
   <ng-container *ngIf="activeTagLink === 'pageConfigSpecimen'">
     <app-configuration-specimen></app-configuration-specimen>
   </ng-container>
+
+  <!-- 药品 -->
+  <ng-container *ngIf="activeTagLink === 'pageConfigDrug'">
+    <app-configuration-drug></app-configuration-drug>
+  </ng-container>
 </div>
 
 

src/app/views/page-config/page-config.module.ts

@@ -5,12 +5,14 @@ import { PageConfigRoutingModule } from './page-config-routing.module';
 import { PageConfigComponent } from './page-config.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationSpecimenComponent } from 'src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component';
+import { ConfigurationDrugComponent } from 'src/app/components/configurationCenter/configuration-drug/configuration-drug.component';
 
 
 @NgModule({
   declarations: [
     PageConfigComponent,
     ConfigurationSpecimenComponent,
+    ConfigurationDrugComponent,
   ],
   imports: [
     CommonModule,

src/app/views/task-type-management/task-type-management.component.html

@@ -61,11 +61,13 @@
           </nz-select>
         </div>
         <ng-container *ngIf="association.value == 'ordinary'">
-          <nz-form-label class="label" nzRequired>关联业务</nz-form-label>
-          <!-- 关联业务禁止修改 -->
-          <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择关联业务" [(ngModel)]="relatedBusiness.id" [nzDisabled]="!add">
-            <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allRelatedBusiness"></nz-option>
-          </nz-select>
+          <div nz-row class="mb8 display_flex align-items_center">
+            <nz-form-label class="label" nzRequired>关联业务</nz-form-label>
+            <!-- 关联业务禁止修改 -->
+            <nz-select class="flex_1" nzShowSearch nzAllowClear nzPlaceHolder="请选择关联业务" [(ngModel)]="relatedBusiness.id" [nzDisabled]="!add">
+              <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allRelatedBusiness"></nz-option>
+            </nz-select>
+          </div>
         </ng-container>
         <nz-form-label *ngIf="association.value == 'specimen'" class="label" nzRequired>空单默认科室</nz-form-label>
         <nz-select *ngIf="association.value == 'specimen'" class="mb8 w100" [ngClass]="{remandTypeId:!defaultNullDeptId}"