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

package-lock.json

@@ -10191,6 +10191,7 @@
     },
     "node_modules/npm/node_modules/lodash._baseindexof": {
       "version": "3.1.0",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -10205,16 +10206,19 @@
     },
     "node_modules/npm/node_modules/lodash._bindcallback": {
       "version": "3.0.1",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/lodash._cacheindexof": {
       "version": "3.0.2",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/lodash._createcache": {
       "version": "3.1.2",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -10228,6 +10232,7 @@
     },
     "node_modules/npm/node_modules/lodash._getnative": {
       "version": "3.9.1",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -10243,6 +10248,7 @@
     },
     "node_modules/npm/node_modules/lodash.restparam": {
       "version": "3.6.1",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },

src/app/app-routing.module.ts

@@ -17,8 +17,12 @@ import { SpecimenRoomViewGuard } from './guard/SpecimenRoomViewGuard.guard';
 import { PathologyGuard } from './guard/Pathology.guard';
 // 全局业务查看权限
 import { DisinfectionSupplyGuard } from './guard/DisinfectionSupplyGuard.guard';
-// 配置中心查看权限
-import { ConfigurationCenterGuard } from './guard/ConfigurationCenter.guard';
+// 事件配置查看权限
+import { IncidentConfigGuard } from './guard/IncidentConfig.guard';
+// 三方配置查看权限
+import { OtherConfigGuard } from './guard/OtherConfig.guard';
+//业务页面控制查看权限
+import { PageConfigGuard } from './guard/PageConfig.guard';
 
 const routes: Routes = [
   // 默认
@@ -96,11 +100,23 @@ const routes: Routes = [
     loadChildren: () => import('./views/disinfection-supply/disinfection-supply.module').then(m => m.DisinfectionSupplyModule),
     canActivate: [DisinfectionSupplyGuard]
   },
-  // 配置中心查看
+  // 事件配置查看
   {
-    path: 'configurationCenter',
-    loadChildren: () => import('./views/configuration-center/configuration-center.module').then(m => m.ConfigurationCenterModule),
-    canActivate: [ConfigurationCenterGuard]
+    path: 'incidentConfig',
+    loadChildren: () => import('./views/incident-config/incident-config.module').then(m => m.IncidentConfigModule),
+    canActivate: [IncidentConfigGuard]
+  },
+  // 三方配置查看
+  {
+    path: 'otherConfig',
+    loadChildren: () => import('./views/other-config/other-config.module').then(m => m.OtherConfigModule),
+    canActivate: [OtherConfigGuard]
+  },
+  // 业务页面控制查看
+  {
+    path: 'pageConfig',
+    loadChildren: () => import('./views/page-config/page-config.module').then(m => m.PageConfigModule),
+    canActivate: [PageConfigGuard]
   },
   // 问卷预览
   {

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

@@ -78,6 +78,7 @@ export class ConfigurationCategoryComponent implements OnInit {
     }
     this.getCategoryList(1);
     this.getHospitals(1);
+    this.getHospitals(2);
     this.getPrioritys();
     this.getScores();
   }
@@ -293,10 +294,10 @@ export class ConfigurationCategoryComponent implements OnInit {
     this.validateConfigForm.controls.userId.setValue(null);
     this.validateConfigForm.controls.groupId.setValue(null);
 
-    this.dutyList = [];
+    // this.dutyList = [];
     this.userList = [];
     this.groupList = [];
-    this.getHospitals(2, id);
+    // this.getHospitals(2, id);
   }
 
   // 获取院区
@@ -308,14 +309,14 @@ export class ConfigurationCategoryComponent implements OnInit {
       this.hospitalList = this.tool.getHospitalList().filter(v => !v.parent);
       return;
     }
-    if(type === 2 && !parentId){
-      this.isLoading = false;
-      this.dutyList = [];
-      return;
-    }
+    // if(type === 2 && !parentId){
+    //   this.isLoading = false;
+    //   this.dutyList = [];
+    //   return;
+    // }
     let postData = {
       hospital: {
-        parent: { id: parentId },
+        // parent: { id: parentId },
         type: { key: 'hospital_type', value: '6' },
       },
       idx: 0,
@@ -616,7 +617,7 @@ export class ConfigurationCategoryComponent implements OnInit {
     }else if(data.userGroup === 2){
       this.requiredConfigChange('userId', false);
     }
-    data.hosId && this.getHospitals(2, data.hosId);
+    // data.hosId && this.getHospitals(2, data.hosId);
     data.dutyId && this.getUsers('', true);
     data.dutyId && this.getGroups('', true);
   }

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

@@ -0,0 +1,70 @@
+<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 *ngIf="tabModalName=='characteristics'">
+                <!-- 扫描时指定科室不提醒勾选项 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">扫描时指定科室不提醒勾选项</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="deptNotAlert" (ngModelChange)="changeDeptNotAlert($event)"></nz-checkbox-group>
+                </div>
+                <!-- 科室 -->
+                <div class="display_flex align-items_center mb8" *ngIf="deptNotAlert[0].checked">
+                  <nz-form-label class="label" nzRequired>科室</nz-form-label>
+                  <nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear
+                    (nzOnSearch)="changeDept($event)" nzPlaceHolder="请选择科室" [(ngModel)]="deptNotAlertIds" (nzOpenChange)="openDeptList($event)">
+                    <ng-container *ngFor="let option of deptList">
+                      <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                    </ng-container>
+                    <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                    </nz-option>
+                  </nz-select>
+                </div>
+
+                <!-- 收取时需扫描二维码 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">收取时需扫描二维码</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="arriveScanCode" (ngModelChange)="changeArriveScanCode($event)"></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)]="arriveScanDynamicCode"></nz-checkbox-group>
+                </div>
+              </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>
+            <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-specimen/configuration-specimen.component.less

@@ -0,0 +1,823 @@
+@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;
+        }
+
+        & > 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-specimen/configuration-specimen.component.ts

@@ -0,0 +1,192 @@
+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-specimen",
+  templateUrl: "./configuration-specimen.component.html",
+  styleUrls: ["./configuration-specimen.component.less"],
+})
+export class ConfigurationSpecimenComponent implements OnInit {
+  loading:boolean = false; //页面加载的loading
+  btnLoading:boolean = false; //提交按钮的loading
+  tabModalName:string = 'characteristics'; //当前选中的tab
+  hosId = this.tool.getCurrentHospital().id; //当前院区
+
+  // 扫描时指定科室不提醒勾选项
+  deptNotAlert:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+  // 收取时需扫描二维码
+  arriveScanCode:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+  // 必须扫描动态二维码
+  arriveScanDynamicCode:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+  // 配置
+  configs:any = {};
+  // 任务类型
+  tasktype:any = {};
+  searchTimerSubject = new Subject();
+  constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
+
+  ngOnInit():void {
+    // todo
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.getDeptList();
+    this.getTaskType();
+  }
+
+  // 扫描时指定科室不提醒勾选项
+  changeDeptNotAlert(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.deptNotAlertIds = [];
+    }
+  }
+  // 收取时需扫描二维码
+  changeArriveScanCode(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.arriveScanDynamicCode[0].checked = false;
+    }
+  }
+  // 用户输入搜索
+  isLoading: boolean = false;
+  deptNotAlertIds:any[] = [];
+  deptList:any[] = [];
+  changeDept(e) {
+    this.searchTimer(this.getDeptList, e);
+  }
+  // 边输入边搜索节流阀
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+  openDeptList(flag){
+    if(flag){
+      this.getDeptList();
+    }
+  }
+  //获取科室列表
+  getDeptList(e:string = '') {
+    let postData:any = {
+      idx: 0,
+      sum: 20,
+      department: {
+        searchType: 1,// 简单查询
+        hospital: { id: this.hosId },
+        dept: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "department", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.deptList = result.list || [];
+        }
+      });
+  }
+
+  // 切换tab
+  tabModal(tabModalName:string){
+    this.tabModalName = tabModalName;
+  }
+  // 保存
+  submitForm() {
+    if(!this.tasktype.id){
+      this.msg.create("warning", "请先配置患者陪检任务类型！");
+      return;
+    }
+    if(this.deptNotAlert[0].checked && !this.deptNotAlertIds.length){
+      this.msg.create("warning", "请选择科室！");
+      return;
+    }
+    let postData:any = {
+      id: this.configs.id,
+      taskType: this.tasktype.id,
+      hosId: this.hosId,
+      deptNotAlert: this.deptNotAlert[0].checked ? 1 : 0,
+      arriveScanCode: this.arriveScanCode[0].checked ? 1 : 0,
+      arriveScanDynamicCode: this.arriveScanDynamicCode[0].checked ? 1 : 0,
+      deptNotAlertIds: this.deptNotAlertIds.length ? this.deptNotAlertIds.toString() : undefined,
+    };
+    this.btnLoading = true;
+    this.mainService
+      .simplePost("addData", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.getConfig();
+        }
+      });
+  }
+
+  //获取任务类型
+  getTaskType() {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskType: {
+        simpleQuery: true,
+        hosId: {
+          id: this.hosId
+        },
+        associationType: {
+          key:"association_types",
+          value: 'specimen'
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskType", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.tasktype = result.list[0] || {};
+          this.getConfig();
+        }
+      });
+  }
+
+  // 获取配置
+  getConfig() {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          associationType: this.tasktype.associationType
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        if (result.status == 200) {
+          this.configs = result.list[0] || {};
+          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.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
+          this.deptList = this.configs.deptNotAlertList || [];
+        }
+      });
+  }
+}

src/app/components/incidentManagement/incident-detail/incident-detail.component.html

@@ -21,7 +21,7 @@
               <div class="col">故障描述：{{incidentData.description}}</div>
             </div>
             <div class="row">
-              <div class="col">详细地址：{{ incidentData.place?.building?.buildingName }}{{ incidentData.place?.floorName }}{{ incidentData.houseNumber }}</div>
+              <div class="col">详细地址：{{ incidentData.place?.building?.buildingName }}{{ incidentData.place ? incidentData.place.floorName + '层' : '' }}{{ incidentData.houseNumber }}</div>
             </div>
             <div class="row">
               <div class="col thumbs">

src/app/components/incidentManagement/incident-handle-repair/incident-handle-repair.component.html

@@ -16,7 +16,7 @@
 </div>
 <div class="detailItem">
   <div class="name">详细地址：</div>
-  <div class="value">{{ incidentData.place ? incidentData.place.building.buildingName : '' }}{{ incidentData.place ? incidentData.place.floorName : '' }}{{ incidentData.houseNumber }}</div>
+  <div class="value">{{ incidentData.place ? incidentData.place.building.buildingName : '' }}{{ incidentData.place ? incidentData.place.floorName + '层' : '' }}{{ incidentData.houseNumber }}</div>
 </div>
 <div class="detailItem">
   <div class="name">报修图片：</div>

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.html

@@ -13,7 +13,7 @@
             <div class="col">故障描述：{{item.description}}</div>
           </div>
           <div class="row">
-            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName : '' }}{{ item.houseNumber }} <span [innerHTML]="item.overtimeRemark"></span></div>
+            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName + '层' : '' }}{{ item.houseNumber }} <span [innerHTML]="item.overtimeRemark"></span></div>
           </div>
           <div class="row">
             <div class="col">申请时间：{{ item.startDate | date: 'yyyy-MM-dd HH:mm'}}</div>

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

@@ -19,11 +19,20 @@ export class SelectMenuComponent implements OnInit {
 
   ngOnInit() {
     let menus = JSON.parse(localStorage.getItem("menu"));
-    let configurationCenter = menus.find(item => item.link == 'configurationCenter');
-    this.configurationCenterMenus = configurationCenter ? (configurationCenter.childrens || []) : [];
+    let configurationCenterMenus = [];
+    // 事件配置
+    let incidentConfig = menus.find(item => item.link == 'incidentConfig');
+    incidentConfig && configurationCenterMenus.push(incidentConfig);
+    // 三方配置
+    let otherConfig = menus.find(item => item.link == 'otherConfig');
+    otherConfig && configurationCenterMenus.push(otherConfig);
+    // 业务页面控制
+    let pageConfig = menus.find(item => item.link == 'pageConfig');
+    pageConfig && configurationCenterMenus.push(pageConfig);
+    this.configurationCenterMenus = configurationCenterMenus;
   }
   clickHandle(item){
-    this.router.navigateByUrl("configurationCenter/" + item.link);
+    this.router.navigateByUrl(item.link);
   }
   // 隐藏模态框
   hideModal() {

src/app/guard/ConfigurationCenter.guard.ts

@@ -4,14 +4,14 @@ import { CanActivate, Router } from '@angular/router';
 @Injectable({
   providedIn: 'root'
 })
-export class ConfigurationCenterGuard implements CanActivate  {
+export class IncidentConfigGuard implements CanActivate  {
   constructor(public router: Router) { }
 
   canActivate(): boolean {
     const menus = JSON.parse(localStorage.getItem('menu'));
     let can = false;
     if (menus) {
-      can = menus.some(e => e.link == 'configurationCenter');
+      can = menus.some(e => e.link == 'incidentConfig');
     }
     if (!can) {
       this.router.navigate(['login']);

src/app/guard/otherConfig.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class OtherConfigGuard implements CanActivate  {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'otherConfig');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/guard/pageConfig.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class PageConfigGuard implements CanActivate  {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'pageConfig');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/views/clinical-users-management/clinical-users-management.component.ts

@@ -335,6 +335,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
         phone: that.validateForm.value.deptPhone,
         hospital: { id: that.add ? that.tool.getCurrentHospital().id : that.hosId },
         weixin: that.validateForm.value.weixin,
+        engineer: this.userTypes.find(v => v.id == that.validateForm.value.usertype).value == 4 ? 1 : 0,
       },
     };
     if (!that.validateForm.value.userGroup) {

src/app/views/configuration-center/configuration-center-routing.module.ts

@@ -1,36 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { ConfigurationCenterComponent } from './configuration-center.component';
-
-
-const routes: Routes = [
-  {
-    path: '',
-    component: ConfigurationCenterComponent,
-    children: [
-      // 默认
-      {
-        path: '',
-        redirectTo: 'incidentConfig',
-        pathMatch: 'full'
-      },
-      {
-        // 事件配置
-        path: 'incidentConfig',
-        loadChildren: () => import('../incident-config/incident-config.module').then(m => m.IncidentConfigModule)
-      },
-      {
-        // 三方配置
-        path: 'otherConfig',
-        loadChildren: () => import('../other-config/other-config.module').then(m => m.OtherConfigModule)
-      }
-    ]
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class ConfigurationCenterRoutingModule { }
-

src/app/views/configuration-center/configuration-center.component.html

@@ -1 +0,0 @@
-<router-outlet></router-outlet>

src/app/views/configuration-center/configuration-center.component.less

@@ -1,5 +0,0 @@
-@import "../../../../src/theme.less";
-:host{
-  width: 100%;
-}
-

src/app/views/configuration-center/configuration-center.component.ts

@@ -1,10 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-@Component({
-  selector: "app-configuration-center",
-  templateUrl: "./configuration-center.component.html",
-  styleUrls: ["./configuration-center.component.less"],
-})
-export class ConfigurationCenterComponent implements OnInit{
-  constructor(){}
-  ngOnInit(): void {}
-}

src/app/views/configuration-center/configuration-center.module.ts

@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { ConfigurationCenterRoutingModule } from './configuration-center-routing.module';
-import { ConfigurationCenterComponent } from './configuration-center.component';
-import { ShareModule } from 'src/app/share/share.module';
-
-
-@NgModule({
-  declarations: [
-    ConfigurationCenterComponent
-  ],
-  imports: [
-    CommonModule,
-    ConfigurationCenterRoutingModule,
-    ShareModule
-  ]
-})
-export class ConfigurationCenterModule { }

src/app/views/fuwutai/fuwutai.component.html

@@ -220,7 +220,7 @@
 
                   <div class="didian">
                     <span class="left">
-                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName : '' }}{{ data.data.houseNumber }}</span>
+                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName + '层' : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName + '层' : '' }}{{ data.data.houseNumber }}</span>
                       <i class="icon_transport transport-a-11111 ml8" *ngIf="data.data.reqAttachment"></i>
                     </span>
                   </div>
@@ -431,7 +431,7 @@
 
                   <div class="didian">
                     <span class="left">
-                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName : '' }}{{ data.data.houseNumber }}</span>
+                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName + '层' : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName + '层' : '' }}{{ data.data.houseNumber }}</span>
                       <i class="icon_transport transport-a-11111 ml8" *ngIf="data.data.reqAttachment"></i>
                     </span>
                   </div>
@@ -635,7 +635,7 @@
 
                   <div class="didian">
                     <span class="left">
-                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName : '' }}{{ data.data.houseNumber }}</span>
+                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName + '层' : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName + '层' : '' }}{{ data.data.houseNumber }}</span>
                       <i class="icon_transport transport-a-11111 ml8" *ngIf="data.data.reqAttachment"></i>
                     </span>
                   </div>

src/app/views/fuwutai/fuwutai.component.ts

@@ -435,7 +435,7 @@ export class FuwutaiComponent implements OnInit {
           if (go === "&go&") {
             this.applyDept = data["startDept"].id;
             this.applyStartDept = data["startDept"];
-            this.incidentModel.incomingPhone = this.callNumber = data["phone"];
+            this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
             this.showPromptModal("建单", true, "", "closeGo");
           } else {
             if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
@@ -473,7 +473,7 @@ export class FuwutaiComponent implements OnInit {
         if (go === "&go&") {
           this.applyDept = data["startDept"].id;
           this.applyStartDept = data["startDept"];
-          this.incidentModel.incomingPhone = this.callNumber = data["phone"];
+          this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
           if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
@@ -535,7 +535,7 @@ export class FuwutaiComponent implements OnInit {
         if (go === "&go&") {
           this.applyDept = data["startDept"].id;
           this.applyStartDept = data["startDept"];
-          this.incidentModel.incomingPhone = this.callNumber = data["phone"];
+          this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
           if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
@@ -1338,21 +1338,32 @@ export class FuwutaiComponent implements OnInit {
         console.log(data);
         console.log(this.incidentModel);
         this.websocketLoading = false;
-        this.incidentModel = {};
-        this.incidentMsg = {};
-        this.incidentModel.callID = data.callId || undefined;
+
+        // 200签入 201摘机 202来电
         if (data.status == 200 && data.phone) {
+          this.incidentModel = {};
+          this.incidentMsg = {};
+          this.incidentModel.callID = data.callId || undefined;
           this.msg.info('签入成功');
           this.cancelBindExtensionNumber();
         } else if (data.status == 201 && data.phone) {
-          this.incidentModel.incomingPhone = this.callNumber = data.phone;
+          this.incidentModel = {};
+          this.incidentMsg = {};
+          this.incidentModel.callID = data.callId || undefined;
+
+          this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data.phone;
           this.searchBxDept();
         } else if (data.status == 201 && data.phone === "") {
+          this.incidentModel = {};
+          this.incidentMsg = {};
+          this.incidentModel.callID = data.callId || undefined;
           //没绑定科室
           if (!this.newOrderShow && !this.newOrderShowOpen) {
             this.applyDept = null;
             this.showNewOrder("no", data.phone, true, '来电弹屏');
           }
+        } else if (data.status == 202) {
+          this.msg.warning(data.msg);
         }
       });
     }else if(sign === 'callCenter'){
@@ -1382,7 +1393,7 @@ export class FuwutaiComponent implements OnInit {
           console.log(result);
           if (result.list.length > 0) {
             //绑定了科室
-            if (!this.newOrderShow && !this.newOrderShowOpen) {
+            // if (!this.newOrderShow && !this.newOrderShowOpen) {
               let incidentModel:any = Object.assign({}, this.incidentModel);
               let incidentMsg:any = Object.assign({}, this.incidentMsg);
               incidentModel.department = result.list[0];
@@ -1400,7 +1411,7 @@ export class FuwutaiComponent implements OnInit {
               this.searchApplicationRequester();
               this.applyDeptMiddle = result.list[0];
               this.showNewOrder("yes", this.incidentModel.incomingPhone, true, '来电弹屏');
-            }
+            // }
           } else {
             //没绑定科室
             console.log(this.newOrderShow);
@@ -3294,7 +3305,7 @@ export class FuwutaiComponent implements OnInit {
       phone !== "&ks&" &&
       phone !== "&go&"
     ) {
-      // this.incidentModel.incomingPhone = this.callNumber = phone;
+      // this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = phone;
       this.applyDept = null;
       this.noArrives = []; //近期配送
     } else if (phone === "&ks&") {
@@ -3302,7 +3313,7 @@ export class FuwutaiComponent implements OnInit {
         (item) => item.id == this.applyDept
       );
       console.log('filter', filter)
-      // this.incidentModel.incomingPhone = this.callNumber = filter[0].phone;
+      // this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = filter[0].phone;
       console.log(this.callNumber); //ceshi
       if (this.currentTabIndex == "255") {
         //患者转运

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

@@ -3,37 +3,37 @@
     <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: activeTagId === tag.id }" (click)="clickTag(tag)">{{ tag.name }}</span>
+        <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="activeTagId === 1">
+  <ng-container *ngIf="activeTagLink === 'incidentConfigCategory'">
     <app-configuration-category></app-configuration-category>
   </ng-container>
   <!-- 优先级 -->
-  <ng-container *ngIf="activeTagId === 2">
+  <ng-container *ngIf="activeTagLink === 'incidentConfigPriority'">
     <app-configuration-priority></app-configuration-priority>
   </ng-container>
   <!-- 数据字典 -->
-  <ng-container *ngIf="activeTagId === 3">
+  <ng-container *ngIf="activeTagLink === 'incidentConfigDictionary'">
     <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
   </ng-container>
   <!-- 消息通知 -->
-  <ng-container *ngIf="activeTagId === 4">
+  <ng-container *ngIf="activeTagLink === 'incidentConfigMessage'">
     <app-configuration-message></app-configuration-message>
   </ng-container>
 	<!-- 工时管理 -->
-	<ng-container *ngIf="activeTagId === 5">
+	<ng-container *ngIf="activeTagLink === 'incidentConfigManHour'">
 	  <app-configuration-manHour></app-configuration-manHour>
 	</ng-container>
 	<!-- 科室绑定人员 -->
-	<ng-container *ngIf="activeTagId === 6">
+	<ng-container *ngIf="activeTagLink === 'incidentConfigDeptUser'">
 	  <app-configuration-deptUser></app-configuration-deptUser>
 	</ng-container>
   <!-- 院区配置 -->
-  <ng-container *ngIf="activeTagId === 7">
+  <ng-container *ngIf="activeTagLink === 'incidentConfigHospital'">
     <app-configuration-hospital></app-configuration-hospital>
   </ng-container>
 </div>

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

@@ -13,13 +13,13 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
 
   // tab
   tagList:any = [
-    { id: 1, name: '故障现象',},
-    { id: 2, name: '优先级',},
-    { id: 3, name: '数据字典',},
-    { id: 4, name: '消息通知',},
-		{ id: 5, name: '工时管理',},
-		{ id: 6, name: '科室绑定人员',},
-    { id: 7, name: '院区配置',},
+    // { id: 1, title: '故障现象',},
+    // { id: 2, title: '优先级',},
+    // { id: 3, title: '数据字典',},
+    // { id: 4, title: '消息通知',},
+		// { id: 5, title: '工时管理',},
+		// { id: 6, title: '科室绑定人员',},
+    // { id: 7, title: '院区配置',},
   ];
 
   // 数据字典
@@ -36,13 +36,16 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
   ngOnInit(): void {}
 
   ngAfterViewInit(){
-    this.clickTag(this.tagList[0]);
+    let menus = JSON.parse(localStorage.getItem("menu"));
+    let incidentConfig = menus.find(item => item.link == 'incidentConfig');
+    this.tagList = incidentConfig ? (incidentConfig.childrens || []) : [];
+    this.tagList.length && this.clickTag(this.tagList[0]);
   }
 
   // 点击tab
-  activeTagId:any = 1;
+  activeTagLink:any;
   clickTag(tag){
-    this.activeTagId = tag.id;
+    this.activeTagLink = tag.link;
   }
 
   // 返回

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

@@ -79,7 +79,7 @@
             <td class="text_align_left">
               {{ data.hosName || '无' }}<br>
               {{ data.department?.dept || '无' }}<br>
-              {{ data.place ? data.place.building.buildingName : '' }}{{ data.place ? data.place.floorName : '' }}{{ data.houseNumber }}
+              {{ data.place ? data.place.building.buildingName : '' }}{{ data.place ? data.place.floorName + '层' : '' }}{{ data.houseNumber }}
             </td>
             <td class="text_align_left">
               {{ data.requester?.name || '无' }}<br>

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

@@ -277,8 +277,8 @@ export class IncidentManagementComponent implements OnInit {
       sum: this.pageSize,
       incident: {
         assignee: this.tool.getCurrentUserId(),
-        acceptDate: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
-        acceptDateEnd: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDate: (this.searchDTO.dateRange && this.searchDTO.dateRange[0]) ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDateEnd: (this.searchDTO.dateRange && this.searchDTO.dateRange[1]) ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
         incidentsign: this.searchDTO.incidentsign,
         department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
         statusId: this.searchDTO.statusId || undefined,
@@ -301,7 +301,7 @@ export class IncidentManagementComponent implements OnInit {
       }
     }else{
         delete postData.incident.duty;
-        delete postData.incident.branch;
+        delete postData.incident.hosId;
     }
 
     postData.incident.queryTask = this.queryTask;
@@ -359,7 +359,7 @@ export class IncidentManagementComponent implements OnInit {
           }
         }else{
             delete incident.duty;
-            delete incident.branch;
+            delete incident.hosId;
         }
 
         incident.assignee = this.tool.getCurrentUserId();
@@ -558,12 +558,11 @@ export class IncidentManagementComponent implements OnInit {
   export() {
     let postData: any = {
       idx: 0,
-      sum: 9999,
+      sum: 99999,
       incident: {
         assignee: this.tool.getCurrentUserId(),
-        duty: this.tool.getCurrentHospital(),
-        acceptDate: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
-        acceptDateEnd: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDate: (this.searchDTO.dateRange && this.searchDTO.dateRange[0]) ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDateEnd: (this.searchDTO.dateRange && this.searchDTO.dateRange[1]) ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
         incidentsign: this.searchDTO.incidentsign,
         department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
         statusId: this.searchDTO.statusId || undefined,
@@ -586,7 +585,7 @@ export class IncidentManagementComponent implements OnInit {
       }
     }else{
         delete postData.incident.duty;
-        delete postData.incident.branch;
+        delete postData.incident.hosId;
     }
 
     postData.incident.queryTask = this.queryTask;

src/app/views/main/main.component.html

@@ -32,7 +32,7 @@
         <div class="left">
           <i class="icon_transport transport-tiaodu-fill green" *ngIf='deskRole' (click)="toFuwutai()" nz-tooltip nzTooltipTitle="调度台"></i>
           <i class="icon_transport transport-hushizhihanghuligongzuo green" *ngIf="nurseRole" (click)="toHuShi()" nz-tooltip nzTooltipTitle="护士端"></i>
-          <i class="icon_transport transport-peizhi1 green" *ngIf="configurationCenterRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
+          <i class="icon_transport transport-peizhi1 green" *ngIf="incidentConfigRole || otherConfigRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要上班"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要下班"></i>
           <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole">

src/app/views/main/main.component.ts

@@ -32,7 +32,9 @@ export class MainComponent implements OnInit {
 	specimenRoomView: boolean = false; //标本间权限
 	pathology: boolean = false; //病理科权限
   disinfectionSupplyRole: boolean = false; //全局业务查看权限
-  configurationCenterRole: boolean = false; //配置中心权限
+  incidentConfigRole: boolean = false; //事件配置权限
+  otherConfigRole: boolean = false; //三方配置权限
+  pageConfigRole: boolean = false; //业务页面控制权限
   PCCommutesToWork: boolean = false; //PC上下班权限
   @ViewChild("osComponentRef1", {
     read: OverlayScrollbarsComponent,
@@ -303,9 +305,17 @@ export class MainComponent implements OnInit {
         this.disinfectionSupplyRole = true;
         console.log("全局业务查看权限");
       }
-      if (e.link == "configurationCenter") {
-        this.configurationCenterRole = true;
-        console.log("配置中心权限");
+      if (e.link == "incidentConfig") {
+        this.incidentConfigRole = true;
+        console.log("事件配置权限");
+      }
+      if (e.link == "otherConfig") {
+        this.otherConfigRole = true;
+        console.log("三方配置权限");
+      }
+      if (e.link == "pageConfig") {
+        this.pageConfigRole = true;
+        console.log("业务页面控制权限");
       }
       if (e.link == "PCCommutesToWork") {
         this.PCCommutesToWork = true;

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

@@ -3,21 +3,21 @@
     <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: activeTagId === tag.id }" (click)="clickTag(tag)">{{ tag.name }}</span>
+        <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="activeTagId === 1">
+  <ng-container *ngIf="activeTagLink === 'otherConfigCallcenter'">
     <app-configuration-callcenter></app-configuration-callcenter>
   </ng-container>
   <!-- 微信配置 -->
-  <ng-container *ngIf="activeTagId === 2">
+  <ng-container *ngIf="activeTagLink === 'otherConfigWechat'">
     <app-configuration-wechat></app-configuration-wechat>
   </ng-container>
   <!-- 数据字典 -->
-  <ng-container *ngIf="activeTagId === 3">
+  <ng-container *ngIf="activeTagLink === 'otherConfigDictionary'">
     <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
   </ng-container>
 </div>

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

@@ -13,9 +13,9 @@ export class OtherConfigComponent implements OnInit, AfterViewInit {
 
   // tab
   tagList:any = [
-    { id: 1, name: '呼叫中心',},
-    { id: 2, name: '微信配置',},
-    { id: 3, name: '数据字典',},
+    // { id: 1, name: '呼叫中心',},
+    // { id: 2, name: '微信配置',},
+    // { id: 3, name: '数据字典',},
   ];
 
   // 数据字典
@@ -26,13 +26,17 @@ export class OtherConfigComponent implements OnInit, AfterViewInit {
   ngOnInit(): void {}
 
   ngAfterViewInit(){
-    this.clickTag(this.tagList[0]);
+    let menus = JSON.parse(localStorage.getItem("menu"));
+    let otherConfig = menus.find(item => item.link == 'otherConfig');
+    this.tagList = otherConfig ? (otherConfig.childrens || []) : [];
+    this.tagList.length && this.clickTag(this.tagList[0]);
+    this.tagList.length && this.clickTag(this.tagList[0]);
   }
 
   // 点击tab
-  activeTagId:any = 1;
+  activeTagLink:any = 1;
   clickTag(tag){
-    this.activeTagId = tag.id;
+    this.activeTagLink = tag.link;
   }
 
   // 返回

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

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

src/app/views/page-config/page-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 === 'pageConfigSpecimen'">
+    <app-configuration-specimen></app-configuration-specimen>
+  </ng-container>
+</div>
+
+

src/app/views/page-config/page-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/page-config/page-config.component.ts

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

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

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+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';
+
+
+@NgModule({
+  declarations: [
+    PageConfigComponent,
+    ConfigurationSpecimenComponent,
+  ],
+  imports: [
+    CommonModule,
+    PageConfigRoutingModule,
+    ShareModule,
+  ]
+})
+export class PageConfigModule { }

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

@@ -418,6 +418,7 @@ export class UsersManagementComponent implements OnInit {
         hospital: { id: that.hosId },
         weixin: that.validateForm.value.weixin,
         companyId: that.validateForm.value.companyId || undefined,
+        engineer: that.validateForm.value.usertype == 4 ? 1 : 0,
       },
     };
     if (!that.validateForm.value.userGroup) {

src/common.less

@@ -1,6 +1,9 @@
 .ant-table-tbody tr:nth-of-type(2n){
   background-color: #e9f7e9!important;
 }
+.w320px {
+  width: 320px;
+}
 .pt0{
   padding-top: 0!important;
 }