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

src/app/app-routing.module.ts

@@ -112,6 +112,12 @@ const routes: Routes = [
     loadChildren: () => import('./views/other-config/other-config.module').then(m => m.OtherConfigModule),
     canActivate: [OtherConfigGuard]
   },
+	// 系统配置
+	{
+	  path: 'systemConfig',
+	  loadChildren: () => import('./views/system-config/system-config.module').then(m => m.SystemConfigModule),
+	  canActivate: [PageConfigGuard]
+	},
   // 业务页面控制查看
   {
     path: 'pageConfig',

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

@@ -93,7 +93,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
 				cascadeHosId: this.currentHospital.id,
 	    },
 	    idx: 0,
-	    sum: 20,
+	    sum: 9999,
 	  };
 		that.mainService
 		  .getFetchDataList("data", "department", data)

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

@@ -0,0 +1,68 @@
+<div class="content specimen">
+  <div class="contentInner">
+    <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> -->
+            <div class="list" *ngIf="!loading">
+              <!-- 动态数字密钥 -->
+              <div>
+                <!-- 数字密钥 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">数字密钥</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="returnSpecimenWhetherHandover"></nz-checkbox-group>
+                </div>
+								
+								<!-- 数字密钥位数 -->
+								<div class="display_flex align-items_center mb8" *ngIf="returnSpecimenWhetherHandover[0].checked">
+								  <nz-form-label class="label">数字密钥位数</nz-form-label>
+									<nz-radio-group [(ngModel)]="keyNum">
+									  <label nz-radio [nzValue]="4">4位</label>
+									  <label nz-radio [nzValue]="6">6位</label>
+									</nz-radio-group>
+								</div>
+								
+								<!-- 数字密钥时效 -->
+								<div class="display_flex align-items_center mb8" *ngIf="returnSpecimenWhetherHandover[0].checked">
+								  <nz-form-label class="label">数字密钥时效</nz-form-label>
+									<nz-input-group nzSuffix="分钟">
+										<input type="number" nz-input [(ngModel)]="keyMinute" />
+									</nz-input-group>
+								</div>
+								
+								<!-- 使用有效性 -->
+								<div class="display_flex align-items_center mb8" *ngIf="returnSpecimenWhetherHandover[0].checked">
+								  <nz-form-label class="label">使用有效性</nz-form-label>
+									<nz-radio-group [(ngModel)]="keyValid">
+									  <label nz-radio [nzValue]="'1'">单次使用</label>
+									  <label nz-radio [nzValue]="'-1'">多次使用</label>
+									</nz-radio-group>
+								</div>
+              </div>
+
+              <div class="bottom">
+                <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+              </div>
+            </div>
+            <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-key/configuration-key.component.less

@@ -0,0 +1,831 @@
+@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;
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.specimen{
+      margin: 24px 24px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 40px 158px 72px;
+        border: 1px solid #E8EBEF;
+        .addressAssign{
+          width: 100%;
+          border: none;
+        }
+        .contentBody{
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          padding: 0 16px;
+          gap: 32px;
+        }
+        .hospital{
+          width: 100%;
+          text-align: left;
+        }
+        .classList{
+          .select{
+            width: 313px;
+          }
+        }
+      }
+    }
+    .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;
+      flex-direction: column;
+      align-items: center;
+      padding: 0 16px;
+      gap: 32px;
+      .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 16px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .contentBody2{
+        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 - 224px);
+    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;
+        }
+				
+				.ant-input-affix-wrapper{
+					width: 120px !important;
+				}
+				
+				.ant-input-affix-wrapper .ant-input:not(:last-child){
+					padding-right: 40px !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-key/configuration-key.component.ts

@@ -0,0 +1,110 @@
+import { Component, OnInit } 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 } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+
+@Component({
+  selector: "app-configuration-key",
+  templateUrl: "./configuration-key.component.html",
+  styleUrls: ["./configuration-key.component.less"],
+})
+export class ConfigurationKeyComponent implements OnInit {
+  loading:boolean = false; //页面加载的loading
+  btnLoading:boolean = false; //提交按钮的loading
+  tabModalName:string = 'characteristics'; //当前选中的tab
+  hosId = this.tool.getCurrentHospital().id; //当前院区
+
+  // 数字密钥
+  returnSpecimenWhetherHandover:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+  // 数字密钥位数
+  keyNum:any = 4;
+	
+	// 数字密钥时效
+	keyMinute:any = 3;
+	
+	// 使用有效期
+	keyValid:any = 1;
+	
+	hospitalList:any[] = [];
+	
+  // 配置
+  configs:any = {};
+  // 任务类型
+  tasktype:any = {};
+  searchTimerSubject = new Subject();
+  constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
+
+  ngOnInit():void {
+		this.getConfig();
+  }
+
+  // 用户输入搜索
+  isLoading: boolean = false;
+  deptNotAlertIds:any[] = [];
+  deptList:any[] = [];
+	
+  // 保存
+  submitForm() {
+		for(let i of this.hospitalList){
+			if(i.key=='digitalSecretKey'){
+				if(this.returnSpecimenWhetherHandover[0].checked){
+					i.value = 1
+				}else{
+					i.value = 0
+				}
+			}else if(i.key=='numberDigitalSecretKey'){
+				i.value = this.keyNum
+			}else if(i.key=='digitalSecretKeyValidTime'){
+				i.value = this.keyMinute
+			}else if(i.key=='validityDigitalSecretKey'){
+				i.value = this.keyValid
+			}
+		}
+    this.btnLoading = true;
+    this.mainService.simplePost("addListData", "hospitalConfig", this.hospitalList).subscribe((result:any) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.getConfig();
+        }
+      });
+  }
+
+  // 获取配置
+  getConfig() {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 9999,
+			hospitalConfig:{
+				hosId:this.hosId,
+				model:"all"
+			}
+    };
+    this.mainService.getFetchDataList("simple/data", "hospitalConfig", postData).subscribe((result:any) => {
+        this.loading = false;
+        if (result.status == 200) {
+					this.hospitalList = result.list || [];
+					for(let i of this.hospitalList){
+						if(i.key=='digitalSecretKey'){
+							if(i.value==1){
+								this.returnSpecimenWhetherHandover[0].checked = true
+							}else{
+								this.returnSpecimenWhetherHandover[0].checked = false
+							}
+						}else if(i.key=='numberDigitalSecretKey'){
+							this.keyNum = Number(i.value) 
+						}else if(i.key=='digitalSecretKeyValidTime'){
+							this.keyMinute = Number(i.value)
+						}else if(i.key=='validityDigitalSecretKey'){
+							this.keyValid = i.value
+						}
+					}
+        }
+      });
+  }
+}

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

@@ -44,7 +44,13 @@
                   <nz-form-label class="label">必须扫描动态二维码</nz-form-label>
                   <nz-checkbox-group [(ngModel)]="arriveScanDynamicCode"></nz-checkbox-group>
                 </div>
-
+								
+								<!-- 输入动态数字密钥 -->
+								<div class="display_flex align-items_center mb8" *ngIf="arriveScanCode[0].checked">
+								  <nz-form-label class="label">输入动态数字密钥</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="enterDynamicDigitalKey"></nz-checkbox-group>
+								</div>
+								
                 <!-- 退回标本是否填写交接人 -->
                 <div class="display_flex align-items_center mb8">
                   <nz-form-label class="label">退回标本是否填写交接人</nz-form-label>

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

@@ -30,7 +30,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
   arriveScanDynamicCode:any[] = [
     {label:'是否开启',value: 0}
   ];
-
+	
+	// 必须扫描动态二维码
+	enterDynamicDigitalKey:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	
   // 退回标本是否填写交接人
   returnSpecimenWhetherHandover:any[] = [
     {label:'是否开启',value: 0}
@@ -85,6 +90,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
     console.log(e);
     if(!e[0].checked){
       this.arriveScanDynamicCode[0].checked = false;
+			this.enterDynamicDigitalKey[0].checked = false;
     }
   }
   // 用户输入搜索
@@ -146,6 +152,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
       deptNotAlert: this.deptNotAlert[0].checked ? 1 : 0,
       arriveScanCode: this.arriveScanCode[0].checked ? 1 : 0,
       arriveScanDynamicCode: this.arriveScanDynamicCode[0].checked ? 1 : 0,
+			enterDynamicDigitalKey: this.enterDynamicDigitalKey[0].checked ? 1 : 0,
       returnSpecimenWhetherHandover: this.returnSpecimenWhetherHandover[0].checked ? 1 : 0,
       bigScanShowSignBtn: this.bigScanShowSignBtn[0].checked ? 1 : 0,
       bigScanArriveNotOwner: this.bigScanArriveNotOwner[0].checked ? 1 : 0,
@@ -214,7 +221,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
           this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
           this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
           this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;
-          this.returnSpecimenWhetherHandover[0].checked = this.configs.returnSpecimenWhetherHandover == 1;
+					this.enterDynamicDigitalKey[0].checked = this.configs.enterDynamicDigitalKey == 1;
+					this.returnSpecimenWhetherHandover[0].checked = this.configs.returnSpecimenWhetherHandover == 1;
           this.bigScanShowSignBtn[0].checked = this.configs.bigScanShowSignBtn == 1;
           this.bigScanArriveNotOwner[0].checked = this.configs.bigScanArriveNotOwner == 1;
           this.bigScanShowCreateBtn[0].checked = this.configs.bigScanShowCreateBtn == 1;

src/app/components/select-menu/select-menu.component.less

@@ -9,7 +9,7 @@
   z-index: 99;
 
   .modalBody {
-    width: 467px;
+    width: 688px;
     background: #fff;
     border-radius: 5px;
     padding: 10px 20px;

src/app/components/select-menu/select-menu.component.ts

@@ -26,6 +26,9 @@ export class SelectMenuComponent implements OnInit {
     // 三方配置
     let otherConfig = menus.find(item => item.link == 'otherConfig');
     otherConfig && configurationCenterMenus.push(otherConfig);
+		// 系统配置
+		let systemConfig = menus.find(item => item.link == 'systemConfig');
+		systemConfig && configurationCenterMenus.push(systemConfig);
     // 业务页面控制
     let pageConfig = menus.find(item => item.link == 'pageConfig');
     pageConfig && configurationCenterMenus.push(pageConfig);

src/app/services/main.service.ts

@@ -1012,4 +1012,11 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+	// 获取动态密钥
+	getSecretKey(deptId) {
+	  return this.http.post(host.host + `/dept/secretKey/${deptId}`,{}, {
+	    headers: this.headers,
+	  });
+	}
+	
 }

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

@@ -3680,7 +3680,7 @@
 
 <!-- 科室二维码模态框 -->
 <!-- 在模态框所在的 div 添加属性 [appDrag] -->
-<div appDrag class="modal" *ngIf="isShowNurseCode">
+<div appDrag class="modal" [ngClass]="{'isKeyClass': iskeySwitch}" *ngIf="isShowNurseCode">
   <div class="header drag-title">
     <h2>签到二维码</h2>
     <i
@@ -3688,6 +3688,7 @@
       (click)="closeNurseCode()"
     ></i>
   </div>
+	<div class="key" *ngIf="iskeySwitch">{{numberKey}}</div>
   <div class="dialog-center">
     <div class="dialog-code">
       <img [src]="nurseCodeImg" alt="" />

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

@@ -108,7 +108,11 @@
     right: 0;
     height: 100%;
   }
-
+	
+	.isKeyClass{
+		height: 350px !important;
+	}
+	
   .modal {
     // 相对于 background 定位， 位置暂时设置为 0，0，0，0 在指令中将其位置水平垂直居中在页面中间
     position: absolute;
@@ -117,7 +121,7 @@
     bottom: 0;
     right: 0;
     width: 280px;
-    height: 310px;
+    height: 300px;
     z-index: 3100;
     background: #f9fafb;
     box-shadow: 1px 1px 20px rgba(0, 0, 0, 0.3);
@@ -138,7 +142,8 @@
         text-align: center;
         margin: 0;
       }
-
+			
+			
       .icon-close {
         position: absolute;
         top: 0;
@@ -148,7 +153,18 @@
         color: @hs_border_color;
       }
     }
-
+		
+		.key{
+			letter-spacing: 10px;
+			font-weight: bold;
+			font-size: 30px;
+			text-align: center;
+			color: #000;
+			position: relative;
+			top: -15px;
+			height: 33px;
+		}
+		
     .dialog-center {
       width: 235px;
       height: 208px;

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -4497,22 +4497,70 @@ export class HushijiandanComponent implements OnInit {
   timer = null;
   showNurseCode() {
     this.isShowNurseCode = true;
-    this.mainService.getDeptCode([this.loginUserDeptId]).subscribe((data) => {
-      if (data["status"] == 200) {
-        this.nurseCodeImg = data["data"][0].base64;
-        this.refreshQRCodeTime = data["data"][0].refreshQRCodeTime;
-        clearInterval(this.timer);
-        this.timer = setInterval(() => {
-          this.refreshQRCodeTime = Math.max(--this.refreshQRCodeTime, 0);
-          if (this.refreshQRCodeTime === 0) {
-            clearInterval(this.timer);
-            this.showNurseCode();
-          }
-        }, 1000);
+		this.getConfig()
+  }
+	
+	// 获取配置
+	iskeySwitch:any = false;
+	getConfig() {
+	  let postData = {
+	    idx: 0,
+	    sum: 9999,
+			hospitalConfig:{
+				hosId:this.currentHospital.id,
+				model:"all"
+			}
+	  };
+	  this.mainService.getFetchDataList("simple/data", "hospitalConfig", postData).subscribe((result:any) => {
+	      if (result.status == 200) {
+					for(let i of result.list){
+						if(i.key=='digitalSecretKey'){
+							if(i.value==1){
+								this.iskeySwitch = true
+								this.getSecretKey()
+							}else{
+								this.iskeySwitch = false
+								this.mainService.getDeptCode([this.loginUserDeptId]).subscribe((data) => {
+								  if (data["status"] == 200) {
+								    this.nurseCodeImg = data["data"][0].base64;
+								    this.refreshQRCodeTime = data["data"][0].refreshQRCodeTime;
+								    clearInterval(this.timer);
+								    this.timer = setInterval(() => {
+								      this.refreshQRCodeTime = Math.max(--this.refreshQRCodeTime, 0);
+								      if (this.refreshQRCodeTime === 0) {
+								        clearInterval(this.timer);
+								        this.showNurseCode();
+								      }
+								    }, 1000);
+								  }
+								});
+							}
+						}
+					}
+	      }
+	    });
+	}
+	
+	// 获取动态密钥
+	numberKey:any;
+	getSecretKey(){
+		this.mainService.getSecretKey(this.currentDept.id).subscribe((res:any) => {
+      if (res["status"] == 200) {
+        this.numberKey = res.data.digitalSecretKey;
+				this.nurseCodeImg = res.data.base64;
+				this.refreshQRCodeTime = res.data.refreshQRCodeTime;
+				clearInterval(this.timer);
+				this.timer = setInterval(() => {
+				  this.refreshQRCodeTime = Math.max(--this.refreshQRCodeTime, 0);
+				  if (this.refreshQRCodeTime === 0) {
+				    clearInterval(this.timer);
+				    this.showNurseCode();
+				  }
+				}, 1000);
       }
     });
-  }
-
+	}
+	
   // 右侧菜单
   showLastItems: boolean = false;
   // 下拉

src/app/views/specimen-room-view/specimen-room-view.component.html

@@ -69,7 +69,7 @@
       </div>
       <!-- 搜索框 end -->
       <!-- 列表 start -->
-      <overlay-scrollbars #osComponentRef1 class="pharmacy-main__selectionWrap">
+      <div #osComponentRef1 class="pharmacy-main__selectionWrap">
         <div *ngIf="!loading1" style="height: 100%">
           <div
             class="pharmacy-main__selection noPointer"
@@ -130,7 +130,7 @@
             </div>
           </div>
         </div>
-      </overlay-scrollbars>
+      </div>
       <!-- 列表 end -->
     </div>
 
@@ -159,7 +159,7 @@
       </div>
       <!-- 搜索框 end -->
       <!-- 列表 start -->
-      <overlay-scrollbars #osComponentRef2 class="pharmacy-main__selectionWrap">
+      <div #osComponentRef2 class="pharmacy-main__selectionWrap">
         <div *ngIf="!loading2" style="height: 100%">
           <div
             class="pharmacy-main__selection"
@@ -220,7 +220,7 @@
             </div>
           </div>
         </div>
-      </overlay-scrollbars>
+      </div>
       <!-- 列表 end -->
     </div>
 
@@ -249,7 +249,7 @@
       </div>
       <!-- 搜索框 end -->
       <!-- 列表 start -->
-      <overlay-scrollbars #osComponentRef3 class="pharmacy-main__selectionWrap">
+      <div #osComponentRef3 class="pharmacy-main__selectionWrap">
         <div *ngIf="!loading3" style="height: 100%">
           <div
             class="pharmacy-main__selection"
@@ -314,7 +314,7 @@
             </div>
           </div>
         </div>
-      </overlay-scrollbars>
+      </div>
       <!-- 列表 end -->
     </div>
   </div>

src/app/views/specimen-room-view/specimen-room-view.component.less

@@ -329,6 +329,7 @@
             display: flex;
             flex-direction: column;
             justify-content: space-between;
+						width: 100%;
             .pharmacy-main__selectionItem {
               display: flex;
               justify-content: space-between;

src/app/views/system-config/system-config-routing.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { SystemConfigComponent } from './system-config.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: SystemConfigComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class SystemConfigRoutingModule { }
+

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

@@ -0,0 +1,17 @@
+<div class="incidentConfig">
+  <div class="tagsAndTemplete">
+    <div class="tags">
+      <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>
+      <button nz-button class="btn default" (click)="goBack()">返回</button>
+    </div>
+  </div>
+  <!-- 动态数字密钥 -->
+  <ng-container *ngIf="activeTagLink === 'systemConfigKey'">
+    <app-configuration-key></app-configuration-key>
+  </ng-container>
+</div>
+
+

src/app/views/system-config/system-config.component.less

@@ -0,0 +1,57 @@
+@import "../../../../src/theme.less";
+:host {
+  width: 100%;
+  .incidentConfig{
+    padding-bottom: 24px;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    background-color: #F0F2F5;
+    .tagsAndTemplete{
+      height: 64px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .tags{
+        height: 100%;
+        background: #fff;
+        flex: 1;
+        padding: 16px 24px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        position: relative;
+        .transport-peizhizhongxin{
+          color: @primary-color;
+          font-size: 20px;
+          margin-right: 8px;;
+        }
+        .tagList{
+          width: 100%;
+          height: 100%;
+          position: absolute;
+          left: 0;
+          top: 50%;
+          transform: translateY(-50%);
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          span{
+            height: 100%;
+            display: inline-block;
+            padding: 0 24px;
+            cursor: pointer;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            &.active{
+              color: @primary-color;
+              background: #F0F6ED;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/views/system-config/system-config.component.ts

@@ -0,0 +1,38 @@
+import { Component, OnInit, AfterViewInit } from "@angular/core";
+import { Location } from '@angular/common';
+
+@Component({
+  selector: "app-system-config",
+  templateUrl: "./system-config.component.html",
+  styleUrls: ["./system-config.component.less"],
+})
+export class SystemConfigComponent implements OnInit, AfterViewInit {
+  constructor(
+    private _location: Location,
+  ){}
+
+  // tab
+  tagList:any = [];
+
+  ngOnInit(): void {}
+
+  ngAfterViewInit(){
+    setTimeout(() => {
+      let menus = JSON.parse(localStorage.getItem("menu"));
+      let systemConfig = menus.find(item => item.link == 'systemConfig');
+      this.tagList = systemConfig ? (systemConfig.childrens || []) : [];
+      this.tagList.length && this.clickTag(this.tagList[0]);
+    }, 0)
+  }
+
+  // 点击tab
+  activeTagLink:any = 1;
+  clickTag(tag){
+    this.activeTagLink = tag.link;
+  }
+
+  // 返回
+  goBack(){
+    this._location.back();
+  }
+}

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

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { SystemConfigRoutingModule } from './system-config-routing.module';
+import { SystemConfigComponent } from './system-config.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { ConfigurationKeyComponent } from 'src/app/components/configurationCenter/configuration-key/configuration-key.component';
+
+
+@NgModule({
+  declarations: [
+    SystemConfigComponent,
+    ConfigurationKeyComponent,
+  ],
+  imports: [
+    CommonModule,
+    SystemConfigRoutingModule,
+    ShareModule,
+  ]
+})
+export class SystemConfigModule { }