合并代码

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-		"target": "http://192.168.3.108",
+		"target": "http://192.168.4.105",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

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

@@ -0,0 +1,43 @@
+<div class="content priority">
+  <div class="contentInner">
+    <div class="addressAssign">
+      <overlay-scrollbars #osComponentRef2 class="contentBody2">
+        <div class="contentBody">
+          <div class="hospital">{{currentHospital.hosName}}</div>
+          <div class="classList">
+            节假日班次：
+            <nz-select class="select" [nzDropdownMatchSelectWidth]="false" nzAllowClear [(ngModel)]="dataInfo.holidayClassId"
+              nzPlaceHolder="请选择节假日班次" nzServerSearch>
+              <ng-container *ngFor="let data of classList1">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </div>
+          <div class="classList">
+            工作日班次：
+            <nz-select class="select" [nzDropdownMatchSelectWidth]="false" nzAllowClear [(ngModel)]="dataInfo.workdayClassId"
+              nzPlaceHolder="请选择工作日班次" nzServerSearch>
+              <ng-container *ngFor="let data of classList2">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <div class="contentBtns">
+        <button nz-button nzType="primary" (click)="submitMessageForm()">确定</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

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

@@ -0,0 +1,142 @@
+@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;
+    &.priority{
+      margin: 24px 275px 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;
+    }
+  }
+}

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

@@ -0,0 +1,115 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { MainService } from "../../../services/main.service";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-configuration-callcenter",
+  templateUrl: "./configuration-callcenter.component.html",
+  styleUrls: ["./configuration-callcenter.component.less"],
+})
+export class ConfigurationCallcenterComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  currentHospital; //当前院区
+
+  ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.getList();
+    this.getClassList(1);
+    this.getClassList(2);
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  dataInfo:any = {};
+  submitMessageForm(): void {
+    this.btnLoading = true;
+    let postData:any = {
+      hosId: this.currentHospital.id,
+      workdayClassId: this.dataInfo.workdayClassId,
+      holidayClassId: this.dataInfo.holidayClassId,
+    };
+    postData = { ...this.dataInfo, ...postData };
+    this.mainService
+      .simplePost("addData", "callCenterConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        let msg = "保存";
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 获取班次
+  isLoading:boolean = false;
+  classList1: any = [];
+  classList2: any = [];
+  // type: 1工作日，2节假日
+  getClassList(type:number) {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      scheduleClass: {
+        hospital: { id: this.currentHospital.id },
+        type,
+      },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "scheduleClass", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this['classList' + type] = data.list || [];
+      });
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  getList() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      callCenterConfig: {
+        hosId: this.currentHospital.id,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "callCenterConfig", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          let list = data.list || [];
+          this.dataInfo = list.length ? list[0] : {};
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+}

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

@@ -12,39 +12,41 @@
           <div class="name">键</div>
           <div class="value">值</div>
         </div>
-        <form nz-form [formGroup]="validateDictionaryForm" class="w100">
-          <div class="dictionaryRow" *ngFor="let data of dictionaryList;let i = index;">
-            <div class="orders">
-              <nz-form-item>
-                <nz-form-control [nzSpan]="24" nzErrorTip="请输入排序号!">
-                  <nz-input-group>
-                    <nz-input-number [formControlName]="'orders_' + data.id" class="ordersInput"></nz-input-number>
-                  </nz-input-group>
-                </nz-form-control>
-              </nz-form-item>
+        <overlay-scrollbars #osComponentRef2 class="contentBody2">
+          <form nz-form [formGroup]="validateDictionaryForm" class="w100">
+            <div class="dictionaryRow" *ngFor="let data of dictionaryList;let i = index;">
+              <div class="orders">
+                <nz-form-item>
+                  <nz-form-control [nzSpan]="24" nzErrorTip="请输入排序号!">
+                    <nz-input-group>
+                      <nz-input-number [formControlName]="'orders_' + data.id" class="ordersInput"></nz-input-number>
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </div>
+              <div class="name">
+                <nz-form-item>
+                  <nz-form-control [nzSpan]="24" nzErrorTip="请输入键!">
+                    <nz-input-group>
+                      <input [formControlName]="'name_' + data.id" nz-input class="nameInput">
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </div>
+              <div class="value">
+                <nz-form-item>
+                  <nz-form-control [nzSpan]="24" nzErrorTip="请输入值!">
+                    <nz-input-group>
+                      <input [formControlName]="'value_' + data.id" nz-input class="valueInput">
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)"></i>
+                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system" (click)="removeField(data, i)"></i>
+              </div>
             </div>
-            <div class="name">
-              <nz-form-item>
-                <nz-form-control [nzSpan]="24" nzErrorTip="请输入键!">
-                  <nz-input-group>
-                    <input [formControlName]="'name_' + data.id" nz-input class="nameInput">
-                  </nz-input-group>
-                </nz-form-control>
-              </nz-form-item>
-            </div>
-            <div class="value">
-              <nz-form-item>
-                <nz-form-control [nzSpan]="24" nzErrorTip="请输入值!">
-                  <nz-input-group>
-                    <input [formControlName]="'value_' + data.id" nz-input class="valueInput">
-                  </nz-input-group>
-                </nz-form-control>
-              </nz-form-item>
-              <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)"></i>
-              <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system" (click)="removeField(data, i)"></i>
-            </div>
-          </div>
-        </form>
+          </form>
+        </overlay-scrollbars>
       </div>
       <div class="contentBtns">
         <button nz-button nzType="primary" class="ml8" (click)="saveDictionary()">保存</button>
@@ -63,4 +65,4 @@
 (confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
 
 <!-- 遮罩 -->
-<app-mask *ngIf="maskFlag"></app-mask>
+<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -32,6 +32,12 @@
     }
     .contentBody{
       padding: 16px;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+    }
+    .contentBody2{
+      flex: 1;
     }
     ::ng-deep .ant-form-item{
       margin-bottom: 0;

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

@@ -26,6 +26,11 @@ export class ConfigurationDictionaryComponent implements OnInit {
     static: false,
   })
   osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
 
   ngOnInit() {
     this.initDictionaryForm();

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

@@ -0,0 +1,25 @@
+<div class="content priority">
+  <div class="contentInner">
+    <div class="addressAssign">
+      <overlay-scrollbars #osComponentRef2 class="contentBody2">
+        <div class="contentBody">
+          <div class="classList" *ngFor="let item of hospitalList">
+            <span>{{ item.desc }}：</span>
+            <nz-radio-group [(ngModel)]="item.value">
+              <label nz-radio nzValue="1">是</label>
+              <label nz-radio nzValue="0">否</label>
+            </nz-radio-group>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <div class="contentBtns">
+        <button nz-button nzType="primary" (click)="submitMessageForm()">确定</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

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

@@ -0,0 +1,146 @@
+@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;
+    &.priority{
+      margin: 24px 275px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 90px 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;
+          }
+          span{
+            display: inline-block;
+            width: 11em;
+          }
+        }
+      }
+    }
+    .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;
+    }
+  }
+}

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

@@ -0,0 +1,91 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { MainService } from "../../../services/main.service";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-configuration-hospital",
+  templateUrl: "./configuration-hospital.component.html",
+  styleUrls: ["./configuration-hospital.component.less"],
+})
+export class ConfigurationHospitalComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  currentHospital; //当前院区
+
+  ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.getList();
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitMessageForm(): void {
+    this.btnLoading = true;
+    let postData:any = {
+      hosId: this.currentHospital.id,
+      // workdayClassId: this.dataInfo.workdayClassId,
+      // holidayClassId: this.dataInfo.holidayClassId,
+    };
+    // postData = { ...this.dataInfo, ...postData };
+    this.mainService
+      .simplePost("addData", "hospitalConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        let msg = "保存";
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  hospitalList:any[] = [];
+  getList() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        hosId: this.currentHospital.id,
+        model: 'itsm',
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.hospitalList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+}

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

@@ -0,0 +1,97 @@
+<div class="content priority">
+  <div class="contentInner">
+    <div class="list-template" id="wechatTable">
+      <div class="list-template__content">
+        <div class="list-template__bottom">
+          <nz-table class="list-template__nzTable" [nzData]="messageList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="5%">序号</th>
+                <th nzWidth="20%">通知描述</th>
+                <th nzWidth="20%">被通知人</th>
+                <th nzWidth="20%">通知模式</th>
+                <th nzWidth="20%">是否开启</th>
+                <th nzWidth="15%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of messageList;let i = index">
+                <td>{{i + 1}}</td>
+                <td>{{data.noticeNode}}</td>
+                <td>{{data.noticeDetails}}</td>
+                <td>
+                  {{data.messageStationFlag == 1 ? '站内消息' : ''}}
+                  {{data.shortMessageFlag == 1 ? '短信' : ''}}
+                  {{data.wechatMessageFlag ==1 ? '微信' : ''}}
+                </td>
+                <td>{{data.flag ==1 ? '是' : '否'}}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="edit(data)">编辑</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalMessage">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideMessageModal()"></i></div>
+    <div class="content">
+      <div class="message_head">
+        <span class="head_item">流程描述：{{ editData.noticeNode }}</span>
+        <span class="head_item">被通知人：{{ editData.noticeDetails }}</span>
+        <span class="head_item">
+          <ng-container  *ngIf="editData.noticeRule !== 'no'&&(editData.noticeCode == 'user_receive_overresp' || editData.noticeCode == 'manager_receive_overresp')">
+            <i class="icon_transport transport-required red"></i>逾期响应时长<nz-input-number class="inputNumber" nzSize="small" [(ngModel)]="editData.noticeRule"></nz-input-number>分钟
+          </ng-container>
+          <ng-container  *ngIf="editData.noticeRule !== 'no'&&(editData.noticeCode == 'user_doing_overresp' || editData.noticeCode == 'manager_doing_overresp')">
+            <i class="icon_transport transport-required red"></i>解决时长剩余<nz-input-number class="inputNumber" nzSize="small" [(ngModel)]="editData.noticeRule"></nz-input-number>%
+          </ng-container>
+        </span>
+      </div>
+      <div class="message_tab">
+        <div class="tab" *ngFor="let item of tabs;let i = index;" (click)="selectTab(i)" [ngClass]="{ active: i == currentIndex }">
+          <label nz-checkbox [(ngModel)]="item.checkboxFlag" (ngModelChange)="selectThis($event, i)"></label><span class="ml8">{{item.tabName}}</span>
+        </div>
+      </div>
+      <div class="message_body">
+        <div class="message_body_list" *ngFor="let item of tabs;let i = index;" [hidden]="i != currentIndex">
+          <div class="message_body_list_title" *ngIf="!(i == 1)">
+            <span>通知标题：</span><input nz-input placeholder="请输入通知标题" [(ngModel)]="item.processTitle" [disabled]="item.disable" />
+          </div>
+          <div class="message_body_list_body">
+            <span>通知内容：</span><textarea class="wd" rows="10" nz-input placeholder="请输入通知内容" [(ngModel)]="item.processContent" [disabled]="item.disable"></textarea>
+          </div>
+          <div class="message_body_list_configure">
+            <span style="visibility: hidden">变量名称：</span>
+            <p>备注：[$变量名称$]可添加<em *ngFor="let v of varArr;let first = first;let last = last;"><span (click)="writeIn(item, v, $event, 'processContent')">{{v}}</span><i *ngIf="!last">、</i><i *ngIf="last">。</i></em></p>
+          </div>
+          <div class="message_body_list_title">
+            <span><i class="icon_transport transport-required red"></i>是否开启：</span>
+            <nz-radio-group [(ngModel)]="editData.flag">
+              <label nz-radio [nzValue]="true">是</label>
+              <label nz-radio [nzValue]="false">否</label>
+            </nz-radio-group>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitMessageForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideMessageModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

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

@@ -0,0 +1,322 @@
+@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;
+    &.priority{
+      margin: 24px 64px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 24px;
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        margin-bottom: 16px;
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .modalBody {
+      width: 350px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .title {
+        width: 100%;
+        text-align: center;
+        font-size: 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+      }
+
+      .content {
+        width: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            // margin-top: 17px;
+
+            i {
+              color: #34b349;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+
+              &.transport-shibai {
+                color: #ff3a52;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .transport-required{
+        font-size: 10px;
+        margin-right: 4px;
+        position: relative;
+        bottom: 2px;
+      }
+      .modalBody {
+        width: 926px;
+        height: auto;
+
+        .content {
+          display: block;
+          width: 100%;
+          height: auto;
+          padding: 0;
+          max-height: 600px;
+          overflow-y: auto;
+          border: 1px solid #E9E9E9;
+
+          .message_head{
+            height: 50px;
+            padding: 0 24px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .head_item{
+              flex: 1;
+              &:first-of-type{
+                text-align: left;
+              }
+              &:last-of-type{
+                text-align: right;
+              }
+              .inputNumber{
+                width: 62px;
+                margin-left: 2px;
+                margin-right: 5px;
+              }
+            }
+          }
+
+          .message_tab{
+            height: 56px;
+            display: flex;
+            border-top: 1px solid #E9E9E9;
+            .tab{
+              height: 100%;
+              flex: 1;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              cursor: pointer;
+              &.active{
+                color: @primary-color;
+                background-color: #EEEEEE;
+              }
+            }
+          }
+
+          .message_body{
+            border-top: 1px solid #E9E9E9;
+            width: 300%;
+            display: flex;
+            .message_body_list{
+              width: 884px;
+              padding: 16px;
+              .message_body_list_title{
+                display: flex;
+                margin-top: 0;
+                align-items: center;
+                span{
+                  flex-shrink: 0;
+                }
+              }
+              .message_body_list_body{
+                display: flex;
+                margin-top: 16px;
+                line-height: 32px;
+                span{
+                  flex-shrink: 0;
+                }
+              }
+              .message_body_list_configure{
+                display: flex;
+                text-align: left;
+                margin-top: 8px;
+                span{
+                  flex-shrink: 0;
+                }
+                em{
+                  font-style: normal;
+                  color: @primary-color;
+                  cursor: pointer;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,281 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { MainService } from "../../../services/main.service";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-configuration-message",
+  templateUrl: "./configuration-message.component.html",
+  styleUrls: ["./configuration-message.component.less"],
+})
+export class ConfigurationMessageComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  currentHospital; //当前院区
+
+  ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
+    setTimeout(() => {
+      this.tableHeight = document.querySelector('#wechatTable').clientHeight - 8 - document.querySelector('#wechatTable .thead').clientHeight;
+    }, 0)
+    this.getList();
+  }
+
+  // 新增弹框
+  modelName = ""; //模态框名称
+  modalMessage: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  //关闭新增/编辑弹框
+  hideMessageModal() {
+    this.modalMessage = false;
+  }
+
+  // 选项卡
+  //tabName: 名称,processTitle:标题, processContent: 内容, checkboxFlag: checkbox是否选中,,disable:遮罩是否显示
+  tabs = []
+
+  //变量参数
+  varArr = [
+    "[$报修单号$]",
+    "[$报修科室$]",
+    "[$报修时间$]",
+    "[$报修人$]",
+    "[$详细地址$]",
+    "[$不受理时间$]",
+    "[$不受理原因$]",
+    "[$故障描述$]",
+    "[$服务台人员$]",
+    "[$受理时间$]",
+    "[$事件单号$]",
+    "[$地点$]",
+    "[$区域$]",
+    "[$学工号$]",
+    "[$联系人电话$]",
+    "[$受理人$]",
+    "[$受理人电话$]",
+    "[$处理人$]",
+    "[$处理人电话$]",
+    "[$指派人$]",
+    "[$转派人$]",
+    "[$延期原因$]",
+    "[$进入系统$]",
+    "[$回访满意度$]",
+    "[$回访备注$]",
+    "[$回访处理结果$]",
+    "[$评价满意度$]",
+    "[$评价内容$]",
+  ];
+
+  // 写入
+  writeIn(tab, content, event, type){
+    console.log(event);
+    var element = event.target.parentElement.parentElement.parentElement.previousElementSibling.children[1];
+    if (element.selectionStart || element.selectionStart == '0') {
+        var startPos = element.selectionStart;
+        var endPos = element.selectionEnd;
+        tab[type] = element.value.substring(0, startPos) + content + element.value.substring(endPos);
+        element.focus();
+        setTimeout(() => {
+          element.setSelectionRange(startPos + content.length, startPos + content.length);
+        },0)
+    } else {
+        var val = element.value + content;
+        tab[type] = val;
+        element.focus();
+    }
+  }
+
+  // 编辑
+  currentIndex = 0;
+  editData:any = {};
+  edit(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalMessage = true;
+
+    this.coopData = data;
+    this.editData = {
+        id: data.id,//id
+        noticeCode: data.noticeCode,
+        noticeRule: data.noticeRule === undefined ? 'no' : data.noticeRule,//通知规则,数字
+        noticeNode: data.noticeNode,//流程节点
+        processName: data.processName,//报修流程或者事件流程
+        noticeState: data.noticeState,//状态
+        noticeDetails: data.noticeDetails,//被通知人
+        noticeProcess: data.noticeProcess,//1为报修流程、2为事件流程
+        messageStationContent: data.messageStationContent,//站内消息通知内容
+        shortMessageContent: data.shortMessageContent,//短信通知内容
+        wechatMessageContent: data.wechatMessageContent,//微信通知内容
+        messageStationFlag: data.messageStationFlag == 1 ? true : false,//站内消息是否开启
+        shortMessageFlag: data.shortMessageFlag == 1 ? true : false,//短信是否开启
+        wechatMessageFlag: data.wechatMessageFlag == 1 ? true : false,//微信是否开启
+        messageStationTitle: data.messageStationTitle,//站内消息标题
+        wechatMessageTitle: data.wechatMessageTitle,//微信标题
+        flag: data.flag == 1 ? true : false//总开关是否开启,0为关闭，1为开启
+    };
+
+    this.tabs = [
+      {
+        tabName: "站内消息",
+        processTitle: this.editData.messageStationTitle,
+        processContent: this.editData.messageStationContent,
+        checkboxFlag: this.editData.messageStationFlag,
+        disable: !this.editData.messageStationFlag
+      },
+      {
+          tabName: "短信",
+          processTitle: '',
+          processContent: this.editData.shortMessageContent,
+          checkboxFlag: this.editData.shortMessageFlag,
+          disable: !this.editData.shortMessageFlag
+      },
+      {
+          tabName: "微信",
+          processTitle: this.editData.wechatMessageTitle,
+          processContent: this.editData.wechatMessageContent,
+          checkboxFlag: this.editData.wechatMessageFlag,
+          disable: !this.editData.wechatMessageFlag
+      }
+    ];
+
+    this.currentIndex = 0;
+  }
+
+  //tab页面切换
+  selectTab(index) {
+    this.currentIndex = index;
+  };
+
+  //checkbox选中或者取消
+  selectThis(e, index) {
+    //遮罩切换
+    this.tabs[index].disable = !this.tabs[index].checkboxFlag;
+    //所有checkbox有一个选中，总开关开启
+    this.editData.flag = this.tabs.some(function (v) {
+        return v.checkboxFlag;
+    });
+};
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitMessageForm(): void {
+    this.btnLoading = true;
+    var filterArr = this.tabs.filter(item => {
+      return item.checkboxFlag;
+    });
+    for (var i = 0; i < filterArr.length; i++) {
+        if (filterArr[i].processContent == '') {
+            alert("通知内容【" + filterArr[i].tabName + "】不能为空！");
+            return;
+        } else {
+            var nowArr = [...new Set([...(filterArr[i].processContent.match(/\[\$[^\$\[\]]*?\$\]/g) || []), ...this.varArr])];
+            if (nowArr.length !== this.varArr.length) {
+                alert("【" + filterArr[i].tabName + "】请填写有效的变量名称！");
+                return;
+            }
+        }
+    }
+    let postData:any = {};
+    //请求参数处理(是否有输入数字控件)
+    if (this.editData.noticeRule !== 'no') {
+        postData = {
+            // "messageManager": {
+                "id": this.editData.id,
+                "noticeRule": this.editData.noticeRule,
+                "messageStationFlag": this.tabs[0].checkboxFlag ? 1 : 0,
+                "messageStationTitle": this.tabs[0].processTitle,
+                "messageStationContent": this.tabs[0].processContent,
+                "shortMessageFlag": this.tabs[1].checkboxFlag ? 1 : 0,
+                "shortMessageContent": this.tabs[1].processContent,
+                "wechatMessageFlag": this.tabs[2].checkboxFlag ? 1 : 0,
+                "wechatMessageTitle": this.tabs[2].processTitle,
+                "wechatMessageContent": this.tabs[2].processContent,
+                "flag": this.editData.flag ? 1 : 0
+            // }
+        };
+    } else {
+        postData = {
+            // "messageManager": {
+                "id": this.editData.id,
+                "messageStationFlag": this.tabs[0].checkboxFlag ? 1 : 0,
+                "messageStationTitle": this.tabs[0].processTitle,
+                "messageStationContent": this.tabs[0].processContent,
+                "shortMessageFlag": this.tabs[1].checkboxFlag ? 1 : 0,
+                "shortMessageContent": this.tabs[1].processContent,
+                "wechatMessageFlag": this.tabs[2].checkboxFlag ? 1 : 0,
+                "wechatMessageTitle": this.tabs[2].processTitle,
+                "wechatMessageContent": this.tabs[2].processContent,
+                "flag": this.editData.flag ? 1 : 0
+            // }
+        };
+    }
+    // 关闭模态窗口并传递一个结果
+    postData = Object.assign({}, this.coopData, postData);
+    this.mainService
+      .simplePost("updData", "messageManager", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideMessageModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  messageList: any[] = []; //表格数据
+  tableHeight:number = 0;
+  getList() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      messageManager: {
+        "noticeProcess": 1
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "messageManager", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.messageList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+}

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

@@ -12,11 +12,13 @@
             [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
             <thead>
               <tr class="thead">
-                <th nzWidth="20%">优先级名称</th>
-                <th nzWidth="20%">排序</th>
-                <th nzWidth="20%">响应时间（分钟）</th>
-                <th nzWidth="20%">解决时间（分钟）</th>
-                <th nzWidth="20%">操作</th>
+                <th nzWidth="14%">优先级名称</th>
+                <th nzWidth="14%">排序</th>
+                <th nzWidth="14%">响应时间（分钟）</th>
+                <th nzWidth="14%">解决时间（分钟）</th>
+                <th nzWidth="14%">节假日班次</th>
+                <th nzWidth="14%">工作日班次</th>
+                <th nzWidth="16%">操作</th>
               </tr>
             </thead>
             <tbody>
@@ -25,6 +27,8 @@
                 <td>{{data.orders}}</td>
                 <td>{{data.responseTime}}</td>
                 <td>{{data.handleTime}}</td>
+                <td>{{data.holidayClassDTO?.name}}</td>
+                <td>{{data.workdayClassDTO?.name}}</td>
                 <td>
                   <div class="coop">
                     <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
@@ -87,6 +91,34 @@
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzFor="holidayClassId">&nbsp;&nbsp;节假日班次</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择节假日班次!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="holidayClassId"
+              nzPlaceHolder="请选择节假日班次" nzServerSearch>
+              <ng-container *ngFor="let data of classList1">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzFor="workdayClassId">&nbsp;&nbsp;工作日班次</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择工作日班次!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="workdayClassId"
+              nzPlaceHolder="请选择工作日班次" nzServerSearch>
+              <ng-container *ngFor="let data of classList2">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
       </form>
     </div>
     <div class=" display_flex justify-content_flex-center">

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

@@ -22,16 +22,20 @@ export class ConfigurationPriorityComponent implements OnInit {
   ) {}
 
   coopData: any = {}; //当前操作列
+  currentHospital; //当前院区
 
   formatterMinute = (value: number) => `${value} 分钟`;
   parserMinute = (value: string) => value.replace(' 分钟', '');
 
   ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
     // 优先级
     setTimeout(() => {
       this.tablePriorityHeight = document.querySelector('#priorityTable').clientHeight - document.querySelector('#priorityTable .list-template__top').clientHeight - 8 - document.querySelector('#priorityTable .thead').clientHeight;
     }, 0)
     this.getPriorityList();
+    this.getClassList(1);
+    this.getClassList(2);
   }
 
   // 新增优先级弹框
@@ -61,6 +65,8 @@ export class ConfigurationPriorityComponent implements OnInit {
     this.validatePriorityForm.controls.orders.setValue(data.orders);
     this.validatePriorityForm.controls.responseTime.setValue(data.responseTime);
     this.validatePriorityForm.controls.handleTime.setValue(data.handleTime);
+    this.validatePriorityForm.controls.holidayClassId.setValue(data.holidayClassId);
+    this.validatePriorityForm.controls.workdayClassId.setValue(data.workdayClassId);
   }
 
   // 新增/编辑表单提交
@@ -85,6 +91,8 @@ export class ConfigurationPriorityComponent implements OnInit {
           orders: this.validatePriorityForm.value.orders,
           responseTime: this.validatePriorityForm.value.responseTime,
           handleTime: this.validatePriorityForm.value.handleTime,
+          holidayClassId: this.validatePriorityForm.value.holidayClassId,
+          workdayClassId: this.validatePriorityForm.value.workdayClassId,
         // }
       };
     } else {
@@ -97,6 +105,8 @@ export class ConfigurationPriorityComponent implements OnInit {
             orders: this.validatePriorityForm.value.orders,
             responseTime: this.validatePriorityForm.value.responseTime,
             handleTime: this.validatePriorityForm.value.handleTime,
+            holidayClassId: this.validatePriorityForm.value.holidayClassId,
+            workdayClassId: this.validatePriorityForm.value.workdayClassId,
           }
         // }
       };
@@ -128,6 +138,8 @@ export class ConfigurationPriorityComponent implements OnInit {
       orders: [null, [Validators.required]],//排序号
       responseTime: [0, [Validators.required]],//响应时间
       handleTime: [0, [Validators.required]],//解决时间
+      holidayClassId: [null],//节假日班次
+      workdayClassId: [null],//工作日班次
     });
     console.log(this.validatePriorityForm.controls)
   }
@@ -155,6 +167,28 @@ export class ConfigurationPriorityComponent implements OnInit {
       });
   }
 
+  // 获取班次
+  isLoading:boolean = false;
+  classList1: any = [];
+  classList2: any = [];
+  // type: 1工作日，2节假日
+  getClassList(type:number) {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      scheduleClass: {
+        hospital: { id: this.currentHospital.id },
+        type,
+      },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "scheduleClass", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this['classList' + type] = data.list || [];
+      });
+  }
+
   delModal: boolean = false; //删除模态框
   tipsMsg1: string; //提示框信息
   tipsMsg2: string; //操作后信息

src/app/views/assets-product-management/assets-product-management.component.html

@@ -37,12 +37,13 @@
             <th nzWidth="8%">名称</th>
             <th nzWidth="8%">型号</th>
             <th nzWidth="8%">品牌</th>
+            <th nzWidth="8%">单位</th>
             <th nzWidth="8%">大类</th>
             <th nzWidth="8%">小类</th>
-            <th nzWidth="12%">描述</th>
-            <th nzWidth="14%">供应商</th>
-            <th nzWidth="14%">生产商</th>
-            <th nzWidth="12%">操作</th>
+            <th nzWidth="11%">描述</th>
+            <th nzWidth="11%">供应商</th>
+            <th nzWidth="11%">生产商</th>
+            <th nzWidth="11%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -51,6 +52,7 @@
             <td>{{data.name}}</td>
             <td>{{data.model}}</td>
             <td>{{data.brand}}</td>
+            <td>{{data.unit}}</td>
             <td>{{data.mainTypeDTO?.name}}</td>
             <td>{{data.subTypeDTO?.name}}</td>
             <td>{{data.description}}</td>
@@ -105,6 +107,14 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="unit">单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入单位!">
+              <nz-input-group>
+                  <input formControlName="unit" nz-input placeholder="请输入单位">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
             <nz-form-label [nzSpan]="5" nzRequired nzFor="mainType">大&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;类</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请选择大类!">
               <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="mainType" nzShowSearch

src/app/views/assets-product-management/assets-product-management.component.ts

@@ -137,6 +137,7 @@ export class AssetsProductManagementComponent implements OnInit {
       name: ['', [Validators.required, Validators.pattern(/\S/)]],
       model: ['', [Validators.required, Validators.pattern(/\S/)]],
       brand: ['', [Validators.required, Validators.pattern(/\S/)]],
+      unit: ['', [Validators.required, Validators.pattern(/\S/)]],
       mainType: [null, [Validators.required]],
       subType: [null],
       description: [''],
@@ -258,6 +259,7 @@ export class AssetsProductManagementComponent implements OnInit {
           name: this.validateForm.value.name,
           model: this.validateForm.value.model,
           brand: this.validateForm.value.brand,
+          unit: this.validateForm.value.unit,
           mainType: this.validateForm.value.mainType,
           subType: this.validateForm.value.subType || undefined,
           description: this.validateForm.value.description,
@@ -275,6 +277,7 @@ export class AssetsProductManagementComponent implements OnInit {
             name: this.validateForm.value.name,
             model: this.validateForm.value.model,
             brand: this.validateForm.value.brand,
+            unit: this.validateForm.value.unit,
             mainType: this.validateForm.value.mainType,
             subType: this.validateForm.value.subType || undefined,
             description: this.validateForm.value.description,
@@ -316,6 +319,7 @@ export class AssetsProductManagementComponent implements OnInit {
     this.validateForm.controls.name.setValue(data.name);
     this.validateForm.controls.model.setValue(data.model);
     this.validateForm.controls.brand.setValue(data.brand);
+    this.validateForm.controls.unit.setValue(data.unit);
     this.validateForm.controls.mainType.setValue(data.mainType ? data.mainType.toString() : null);
     this.validateForm.controls.subType.setValue(data.subType ? data.subType.toString() : null);
     this.validateForm.controls.description.setValue(data.description);

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

@@ -20,14 +20,22 @@
   <ng-container *ngIf="activeTagId === 3">
     <app-configuration-dictionary></app-configuration-dictionary>
   </ng-container>
+  <!-- 消息通知 -->
+  <ng-container *ngIf="activeTagId === 4">
+    <app-configuration-message></app-configuration-message>
+  </ng-container>
 	<!-- 工时管理 -->
-	<ng-container *ngIf="activeTagId === 4">
+	<ng-container *ngIf="activeTagId === 5">
 	  <app-configuration-manHour></app-configuration-manHour>
 	</ng-container>
 	<!-- 科室绑定人员 -->
-	<ng-container *ngIf="activeTagId === 5">
+	<ng-container *ngIf="activeTagId === 6">
 	  <app-configuration-deptUser></app-configuration-deptUser>
 	</ng-container>
+  <!-- 院区配置 -->
+  <ng-container *ngIf="activeTagId === 7">
+    <app-configuration-hospital></app-configuration-hospital>
+  </ng-container>
 </div>
 
 

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

@@ -16,8 +16,10 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
     { id: 1, name: '故障现象',},
     { id: 2, name: '优先级',},
     { id: 3, name: '数据字典',},
-		{ id: 4, name: '工时管理',},
-		{ id: 5, name: '科室绑定人员',},
+    { id: 4, name: '消息通知',},
+		{ id: 5, name: '工时管理',},
+		{ id: 6, name: '科室绑定人员',},
+    { id: 7, name: '院区配置',},
   ];
 
   ngOnInit(): void {}

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

@@ -9,6 +9,8 @@ import { ConfigurationPriorityComponent } from 'src/app/components/configuration
 import { ConfigurationDictionaryComponent } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component';
 import { ConfigurationManHourComponent } from 'src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component';
 import { ConfigurationDeptUserComponent } from 'src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component';
+import { ConfigurationMessageComponent } from 'src/app/components/configurationCenter/configuration-message/configuration-message.component';
+import { ConfigurationHospitalComponent } from 'src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component';
 
 
 @NgModule({
@@ -18,7 +20,9 @@ import { ConfigurationDeptUserComponent } from 'src/app/components/configuration
     ConfigurationPriorityComponent,
     ConfigurationDictionaryComponent,
 		ConfigurationManHourComponent,
-		ConfigurationDeptUserComponent
+		ConfigurationDeptUserComponent,
+    ConfigurationMessageComponent,
+    ConfigurationHospitalComponent,
   ],
   imports: [
     CommonModule,

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

@@ -8,13 +8,13 @@
       <button nz-button class="btn default" (click)="goBack()">返回</button>
     </div>
   </div>
-  <!-- 微信配置 -->
+  <!-- 呼叫中心 -->
   <ng-container *ngIf="activeTagId === 1">
-    <app-configuration-wechat></app-configuration-wechat>
+    <app-configuration-callcenter></app-configuration-callcenter>
   </ng-container>
-  <!-- 优先级 -->
+  <!-- 微信配置 -->
   <ng-container *ngIf="activeTagId === 2">
-    <!-- <app-configuration-priority></app-configuration-priority> -->
+    <app-configuration-wechat></app-configuration-wechat>
   </ng-container>
   <!-- 数据字典 -->
   <ng-container *ngIf="activeTagId === 3">

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

@@ -13,8 +13,8 @@ export class OtherConfigComponent implements OnInit, AfterViewInit {
 
   // tab
   tagList:any = [
-    { id: 1, name: '微信配置',},
-    // { id: 2, name: '优先级',},
+    { id: 1, name: '呼叫中心',},
+    { id: 2, name: '微信配置',},
     // { id: 3, name: '数据字典',},
   ];
 

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

@@ -4,29 +4,15 @@ import { CommonModule } from '@angular/common';
 import { OtherConfigRoutingModule } from './other-config-routing.module';
 import { OtherConfigComponent } from './other-config.component';
 import { ShareModule } from 'src/app/share/share.module';
-import { ConfigurationCategoryComponent } from 'src/app/components/configurationCenter/configuration-category/configuration-category.component';
-import { ConfigurationPriorityComponent } from 'src/app/components/configurationCenter/configuration-priority/configuration-priority.component';
-import { ConfigurationDictionaryComponent } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component';
-import { ConfigurationManHourComponent } from 'src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component';
-import { ConfigurationDeptUserComponent } from 'src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component';
-
 import { ConfigurationWechatComponent } from 'src/app/components/configurationCenter/configuration-wechat/configuration-wechat.component';
-// import { ConfigurationPriorityComponent } from 'src/app/components/configurationCenter/configuration-priority/configuration-priority.component';
-// import { ConfigurationDictionaryComponent } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component';
+import { ConfigurationCallcenterComponent } from 'src/app/components/configurationCenter/configuration-callcenter/configuration-callcenter.component';
 
 
 @NgModule({
   declarations: [
     OtherConfigComponent,
-    ConfigurationCategoryComponent,
-    ConfigurationPriorityComponent,
-    ConfigurationDictionaryComponent,
-		ConfigurationManHourComponent,
-		ConfigurationDeptUserComponent,
     ConfigurationWechatComponent,
-    // ConfigurationPriorityComponent,
-    // ConfigurationDictionaryComponent,
-
+    ConfigurationCallcenterComponent,
   ],
   imports: [
     CommonModule,

src/assets/iconfont/demo_index.html

@@ -822,9 +822,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1722850118502') format('woff2'),
-       url('iconfont.woff?t=1722850118502') format('woff'),
-       url('iconfont.ttf?t=1722850118502') format('truetype');
+  src: url('iconfont.woff2?t=1722851970750') format('woff2'),
+       url('iconfont.woff?t=1722851970750') format('woff'),
+       url('iconfont.ttf?t=1722851970750') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1722850118502') format('woff2'),
-       url('iconfont.woff?t=1722850118502') format('woff'),
-       url('iconfont.ttf?t=1722850118502') format('truetype');
+  src: url('iconfont.woff2?t=1722851970750') format('woff2'),
+       url('iconfont.woff?t=1722851970750') format('woff'),
+       url('iconfont.ttf?t=1722851970750') format('truetype');
 }
 
 .icon_transport {

src/common.less

@@ -146,6 +146,22 @@
   flex-wrap: wrap;
 }
 
+.wd{
+  word-break: break-all;
+}
+// list模板样式 end
+
+// 滚动条样式
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+::-webkit-scrollbar-thumb {
+
+
+}
+
 // button
 @lg-btn-height: 52px;
 @default-btn-height: 34px;