配置中心业务页面控制

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

@@ -15,24 +15,36 @@
             <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)]="addService" (ngModelChange)="changeAddService($event)"></nz-checkbox-group>
+                  <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="addService[0].checked">
-                  <nz-form-label class="label" nzRequired>追加服务任务类型</nz-form-label>
+                <!-- 科室 -->
+                <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)="changeTasktype($event)" nzPlaceHolder="请选择追加服务任务类型" [(ngModel)]="addServiceTaskIds">
-                    <ng-container *ngFor="let option of taskTypes">
-                      <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
+                    (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'">

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

@@ -16,8 +16,18 @@ export class ConfigurationSpecimenComponent implements OnInit {
   tabModalName:string = 'characteristics'; //当前选中的tab
   hosId = this.tool.getCurrentHospital().id; //当前院区
 
-  // 是否允许追加服务
-  addService:any[] = [
+  // 扫描时指定科室不提醒勾选项
+  deptNotAlert:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+  // 收取时需扫描二维码
+  arriveScanCode:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+  // 必须扫描动态二维码
+  arriveScanDynamicCode:any[] = [
     {label:'是否开启',value: 0}
   ];
 
@@ -34,52 +44,58 @@ export class ConfigurationSpecimenComponent implements OnInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.getTaskTypes();
+    this.getDeptList();
     this.getTaskType();
   }
 
-  // 修改是否允许追加服务
-  changeAddService(e){
+  // 扫描时指定科室不提醒勾选项
+  changeDeptNotAlert(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.deptNotAlertIds = [];
+    }
+  }
+  // 收取时需扫描二维码
+  changeArriveScanCode(e){
     console.log(e);
     if(!e[0].checked){
-      this.addServiceTaskIds = [];
+      this.arriveScanDynamicCode[0].checked = false;
     }
   }
   // 用户输入搜索
   isLoading: boolean = false;
-  addServiceTaskIds:any[] = [];
-  taskTypes:any[] = [];
-  changeTasktype(e) {
-    this.searchTimer(this.getTaskTypes, e);
+  deptNotAlertIds:any[] = [];
+  deptList:any[] = [];
+  changeDept(e) {
+    this.searchTimer(this.getDeptList, e);
   }
   // 边输入边搜索节流阀
   searchTimer(fun, e) {
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
-  //获取患者其他服务任务类型
-  getTaskTypes(e:string = '') {
+  openDeptList(flag){
+    if(flag){
+      this.getDeptList();
+    }
+  }
+  //获取科室列表
+  getDeptList(e:string = '') {
     let postData:any = {
       idx: 0,
-      sum: 9999,
-      taskType: {
-        taskName: e,
-        simpleQuery: true,
-        hosId: {
-          id: this.hosId
-        },
-        associationType: {
-          key: 'association_types',
-          value: 'patientTransport'
-        }
+      sum: 20,
+      department: {
+        searchType: 1,// 简单查询
+        hospital: { id: this.hosId },
+        dept: e,
       }
     };
     this.isLoading = true;
-    this.mainService.getFetchDataList("simple/data", "taskType", postData)
+    this.mainService.getFetchDataList("simple/data", "department", postData)
       .subscribe((result) => {
         this.isLoading = false;
         if (result.status == 200) {
-          this.taskTypes = result.list || [];
+          this.deptList = result.list || [];
         }
       });
   }
@@ -94,16 +110,18 @@ export class ConfigurationSpecimenComponent implements OnInit {
       this.msg.create("warning", "请先配置患者陪检任务类型！");
       return;
     }
-    if(this.addService[0].checked && !this.addServiceTaskIds.length){
-      this.msg.create("warning", "请选择追加服务任务类型！");
+    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,
-      addService: this.addService[0].checked ? 1 : 0,
-      addServiceTaskIds: this.addServiceTaskIds.length ? this.addServiceTaskIds.toString() : undefined,
+      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
@@ -128,7 +146,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
         },
         associationType: {
           key:"association_types",
-          value: 'inspect'
+          value: 'specimen'
         }
       }
     };
@@ -163,8 +181,11 @@ export class ConfigurationSpecimenComponent implements OnInit {
         this.loading = false;
         if (result.status == 200) {
           this.configs = result.list[0] || {};
-          this.addService[0].checked = this.configs.addService == 1;
-          this.addServiceTaskIds = this.configs.addServiceTaskIds ? this.configs.addServiceTaskIds.split(',').map(v => +v) : [];
+          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/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/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.component.html

@@ -3,13 +3,13 @@
     <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 === 'pageConfigSpecimen'">
     <app-configuration-specimen></app-configuration-specimen>
   </ng-container>
 </div>

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

@@ -13,19 +13,22 @@ export class PageConfigComponent implements OnInit, AfterViewInit {
 
   // tab
   tagList:any = [
-    { id: 1, name: '标本',},
+    // { id: 1, name: '标本',},
   ];
 
   ngOnInit(): void {}
 
   ngAfterViewInit(){
-    this.clickTag(this.tagList[0]);
+    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
-  activeTagId:any = 1;
+  activeTagLink:any = 1;
   clickTag(tag){
-    this.activeTagId = tag.id;
+    this.activeTagLink = tag.link;
   }
 
   // 返回

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;
 }