暂提

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-quick/configuration-quick.component.html

@@ -12,21 +12,25 @@
             [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
             <thead>
               <tr class="thead">
-                <th nzWidth="25%">排序号</th>
-                <th nzWidth="25%">故障现象</th>
-                <th nzWidth="25%">别名</th>
+                <th nzWidth="15%">图标名称</th>
+                <th nzWidth="15%">按钮名称</th>
+                <th nzWidth="15%">关联业务</th>
+                <th nzWidth="15%">排序号</th>
+                <th nzWidth="15%">是否启用</th>
                 <th nzWidth="25%">操作</th>
               </tr>
             </thead>
             <tbody>
               <tr *ngFor="let data of commonFaultsList;let i = index">
+                <td>{{data.icon?.name}}</td>
+                <td>{{data.name}}</td>
+                <td>{{data.bussType?.name}}</td>
                 <td>{{data.orders}}</td>
-                <td>{{data.categoryDTO?.mutiCategory}}</td>
-                <td>{{data.content}}</td>
+                <td>{{data.active === 1 ? '是' : '否'}}</td>
                 <td>
                   <div class="coop">
-                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
                     <span (click)="editPriority(data)">编辑</span>
+                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
                   </div>
                 </td>
               </tr>
@@ -62,19 +66,58 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="content">别名</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请输入别名!">
+          <nz-form-label nzFor="icon" nzRequired [nzSpan]="6">图标名称</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择图标名称!">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择图标名称" formControlName="icon">
+						  <ng-container *ngFor="let option of pagePermissionIconList">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="name">按钮名称</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入按钮名称!">
             <nz-input-group>
-              <input formControlName="content" nz-input placeholder="请输入别名">
+              <input formControlName="name" nz-input placeholder="请输入按钮名称" maxlength="6">
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label nzFor="category" nzRequired [nzSpan]="6">故障现象</nz-form-label>
-          <nz-form-control [nzSpan]="18">
-						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择故障现象" formControlName="category" (nzOnSearch)="changeCommonInp('category', $event)">
+          <nz-form-label nzFor="bussType" nzRequired [nzSpan]="6">关联业务</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择关联业务!">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择关联业务" formControlName="bussType" (ngModelChange)="changeBussType($event)">
+						  <ng-container *ngFor="let option of pagePermissionBussTypeList">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.value"></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 *ngIf="validatePriorityForm.value.bussType === 'service'">
+          <nz-form-label nzFor="quickOperation" nzRequired [nzSpan]="6">快捷操作</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择快捷操作!">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择快捷操作" formControlName="quickOperation">
+						  <ng-container *ngFor="let option of pagePermissionQuickOperationList">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item *ngIf="validatePriorityForm.value.bussType === 'goods'">
+          <nz-form-label nzFor="taskTypeIds" nzRequired [nzSpan]="6">任务类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择任务类型!">
+						<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择任务类型" formControlName="taskTypeIds" (nzOnSearch)="changeCommonInp('taskType', $event)" (ngModelChange)="changeTaskTypeIds($event)">
 						  <ng-container *ngFor="let option of malfunctionData">
-						    <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [nzValue]="option.id"></nz-option>
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
 						  </ng-container>
 						  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 						    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -82,6 +125,21 @@
 						</nz-select>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item *ngIf="validatePriorityForm.value.bussType === 'goods' && hasSpecimen">
+          <nz-form-label nzFor="urgentIds" [nzSpan]="8">是否显示标本数量</nz-form-label>
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择是否显示标本数量!">
+            <nz-checkbox-group class="formItem" formControlName="urgentIds"></nz-checkbox-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label nzFor="active" nzRequired [nzSpan]="6">是否启用</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择是否启用!">
+            <nz-radio-group class="formItem" type="active" formControlName="active">
+              <label nz-radio [nzValue]="1">是</label>
+              <label nz-radio [nzValue]="0">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
       </form>
     </div>
     <div class=" display_flex justify-content_flex-center">
@@ -89,4 +147,4 @@
       <button class="btn cancel" nz-button nzType="default" (click)="hidePriorityModal()">取消</button>
     </div>
   </div>
-</div>
+</div>

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

@@ -35,8 +35,8 @@ export class ConfigurationQuickComponent implements OnInit {
 
   ngOnInit() {
 		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
-      if(v[0] === 'category'){
-        this.searchApplicationCategory(v[1]);
+      if(v[0] === 'taskType'){
+        this.getTaskTypeList(v[1]);
       }
     });
 
@@ -47,7 +47,10 @@ export class ConfigurationQuickComponent implements OnInit {
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.currentHospital = this.tool.getCurrentHospital();
     this.getCommonFaultsList();
-		this.searchApplicationCategory()
+		this.getTaskTypeList();
+    this.getPagePermissionIcon();
+    this.getPagePermissionBussType();
+    this.getPagePermissionQuickOperation();
   }
 
   // 新增优先级弹框
@@ -71,23 +74,102 @@ export class ConfigurationQuickComponent implements OnInit {
 
 	// 获取故障现象数据
   isLoading:boolean = false;
-	searchApplicationCategory(keyWord?){
+	getTaskTypeList(keyWord?){
 		let postData = {
-		  category: {
-        category: keyWord,
-        selectType: "mutlQuery",
-		    hierarchy: 3,
+      idx: 0,
+      sum: 9999,
+		  taskType: {
+        taskName: keyWord,
+        hosIds: this.hosId,
+        assTypeValues: 'specimen,other,ordinary',
+        simpleQuery: true,
 		  },
 		};
     this.isLoading = true;
-		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(data => {
+		this.mainService.getFetchDataList('configuration', "taskType", postData).subscribe(data => {
 		  this.isLoading = false;
       if (data.status == 200) {
-        this.malfunctionData = data.data || [];
+        this.malfunctionData = data.list || [];
       }
 		})
 	}
 
+  // 获取字典数据-图标名称
+  pagePermissionIconList: any[] = [];
+  getPagePermissionIcon() {
+    this.mainService
+      .getDictionary("list", "page_permission_icon")
+      .subscribe((data) => {
+        this.pagePermissionIconList = data;
+      });
+  }
+
+  // 获取字典数据-关联业务
+  pagePermissionBussTypeList: any[] = [];
+  getPagePermissionBussType() {
+    this.mainService
+      .getDictionary("list", "page_permission_buss_type")
+      .subscribe((data) => {
+        this.pagePermissionBussTypeList = data;
+      });
+  }
+
+  // 获取字典数据-快捷操作
+  pagePermissionQuickOperationList: any[] = [];
+  getPagePermissionQuickOperation() {
+    this.mainService
+      .getDictionary("list", "page_permission_quick_operation")
+      .subscribe((data) => {
+        this.pagePermissionQuickOperationList = data;
+      });
+  }
+
+  // 获取字典数据-是否显示标本数量
+  gdEmergencyList: any[] = [
+    { value: 1, label: '急标数量', checked: false },
+    { value: 2, label: '普标数量', checked: false },
+  ];
+
+  // 修改关联业务
+  changeBussType(e){
+    console.log(e);
+    this.validatePriorityForm.controls.quickOperation.setValue(null);
+    this.validatePriorityForm.controls.taskTypeIds.setValue([]);
+    this.validatePriorityForm.controls.urgentIds.setValue(this.gdEmergencyList.map(v => {v.checked = false;return v;}));
+
+    if(e === 'service'){
+      this.requiredChange('quickOperation', true);
+      this.requiredChange('taskTypeIds', false);
+      this.requiredChange('urgentIds', false);
+    }else if(e === 'goods'){
+      this.requiredChange('quickOperation', false);
+      this.requiredChange('taskTypeIds', true);
+      this.requiredChange('urgentIds', false);
+    }
+  }
+
+  // 修改任务类型
+  hasSpecimen:boolean = false;
+  changeTaskTypeIds(e){
+    console.log(e);
+    let o = this.malfunctionData.find(v => v.associationType.value === 'specimen');
+    this.hasSpecimen = e.some(v => v === o.id);
+    this.validatePriorityForm.controls.urgentIds.setValue(this.gdEmergencyList.map(v => {v.checked = false;return v;}));
+
+    this.requiredChange('urgentIds', this.hasSpecimen);
+  }
+
+  requiredChange(field, required: boolean): void {
+    if (!required) {
+      this.validatePriorityForm.get(field)!.clearValidators();
+      this.validatePriorityForm.get(field)!.markAsPristine();
+    } else {
+      this.validatePriorityForm.get(field)!.setValidators(Validators.required);
+      this.validatePriorityForm.get(field)!.markAsDirty();
+    }
+    this.validatePriorityForm.get(field)!.updateValueAndValidity();
+  }
+
   // 编辑
   editPriority(data) {
     console.log(data);
@@ -96,9 +178,25 @@ export class ConfigurationQuickComponent implements OnInit {
     this.modalPriority = true;
     this.initForm();
     this.coopData = data;
+
+    this.changeBussType(data.bussType.value);
+    data.taskTypeIds && this.changeTaskTypeIds(data.taskTypeIds.split(',').map(v => +v));
+
     this.validatePriorityForm.controls.orders.setValue(data.orders);
-    this.validatePriorityForm.controls.content.setValue(data.content);
-    this.validatePriorityForm.controls.category.setValue(data.category);
+    this.validatePriorityForm.controls.icon.setValue(data.icon.id);
+    this.validatePriorityForm.controls.name.setValue(data.name);
+    this.validatePriorityForm.controls.bussType.setValue(data.bussType.value);
+    data.quickOperation && this.validatePriorityForm.controls.quickOperation.setValue(data.quickOperation.id);
+    data.taskTypeIds && this.validatePriorityForm.controls.taskTypeIds.setValue(data.taskTypeIds.split(',').map(v => +v));
+    if(data.urgentIds){
+      let ids = data.urgentIds.split(',').map(v => +v);
+      let urgentIds = this.gdEmergencyList.map(v => {
+        v.checked = ids.includes(v.value);
+        return v;
+      })
+      this.validatePriorityForm.controls.urgentIds.setValue(urgentIds);
+    }
+    this.validatePriorityForm.controls.active.setValue(data.active);
   }
 
   // 新增/编辑表单提交
@@ -117,21 +215,33 @@ export class ConfigurationQuickComponent implements OnInit {
     if (this.add) {
       //增加
       postData = {
+        hosId: this.hosId,
         orders: this.validatePriorityForm.value.orders,
-        content: this.validatePriorityForm.value.content,
-        category: this.validatePriorityForm.value.category,
+        icon: this.validatePriorityForm.value.icon ? { id: this.validatePriorityForm.value.icon } : undefined,
+        name: this.validatePriorityForm.value.name,
+        bussType: this.validatePriorityForm.value.bussType ? this.pagePermissionBussTypeList.find(v => v.value === this.validatePriorityForm.value.bussType) : undefined,
+        quickOperation: this.validatePriorityForm.value.quickOperation ? { id: this.validatePriorityForm.value.quickOperation } : undefined,
+        taskTypeIds: this.validatePriorityForm.value.taskTypeIds.length ? this.validatePriorityForm.value.taskTypeIds.toString() : undefined,
+        urgentIds: this.validatePriorityForm.value.urgentIds.length ? this.validatePriorityForm.value.urgentIds.filter(v => v.checked).map(v => v.value).toString() : undefined,
+        active: this.validatePriorityForm.value.active,
       };
     } else {
       //编辑
       postData = {
 				...this.coopData,
 				orders: this.validatePriorityForm.value.orders,
-        content: this.validatePriorityForm.value.content,
-        category: this.validatePriorityForm.value.category,
+        icon: this.validatePriorityForm.value.icon ? { id: this.validatePriorityForm.value.icon } : undefined,
+        name: this.validatePriorityForm.value.name,
+        bussType: this.validatePriorityForm.value.bussType ? this.pagePermissionBussTypeList.find(v => v.value === this.validatePriorityForm.value.bussType) : undefined,
+        quickOperation: this.validatePriorityForm.value.quickOperation ? { id: this.validatePriorityForm.value.quickOperation } : undefined,
+        taskTypeIds: this.validatePriorityForm.value.taskTypeIds.length ? this.validatePriorityForm.value.taskTypeIds.toString() : undefined,
+        urgentIds: this.validatePriorityForm.value.urgentIds.length ? this.validatePriorityForm.value.urgentIds.filter(v => v.checked).map(v => v.value).toString() : undefined,
+        active: this.validatePriorityForm.value.active,
       };
     }
+    console.log(postData);
     this.mainService
-      .simplePost("addData", "incidentCategoryContent", postData)
+      .simplePost("addData", "pagePermissionConfig", postData)
       .subscribe((result) => {
         this.btnLoading = false;
         this.hidePriorityModal();
@@ -154,8 +264,13 @@ export class ConfigurationQuickComponent implements OnInit {
   initForm() {
     this.validatePriorityForm = this.fb.group({
       orders: [0, [Validators.required]],//排序号
-      content: [null, [Validators.required]],//别名
-      category: [null, [Validators.required]],//故障现象
+      icon: [null, [Validators.required]],//图标名称
+      name: [null, [Validators.required]],//按钮名称
+      bussType: [null, [Validators.required]],//关联业务
+      quickOperation: [null, [Validators.required]],//快捷操作
+      taskTypeIds: [[], [Validators.required]],//关联任务类型
+      urgentIds: [this.gdEmergencyList.map(v => {v.checked = false;return v;}), [Validators.required]],//是否显示标本数量
+      active: [0, [Validators.required]],//是否启用
     });
     console.log(this.validatePriorityForm.controls)
   }
@@ -168,11 +283,13 @@ export class ConfigurationQuickComponent implements OnInit {
     let data = {
 			idx: 0,
 			sum: 99999,
-			incidentCategoryContent: {},
+			pagePermissionConfig: {
+        hosId: this.hosId,
+      },
 		};
 		this.loading1 = true;
 		this.mainService
-			.getFetchDataList("simple/data", "incidentCategoryContent", data)
+			.getFetchDataList("simple/data", "pagePermissionConfig", data)
 			.subscribe((data) => {
 				this.loading1 = false;
 				this.commonFaultsList = data.list || [];
@@ -205,7 +322,7 @@ export class ConfigurationQuickComponent implements OnInit {
     this.btnLoading = true;
 		//删除-优先级
 		this.mainService
-			.simplePost("rmvData", "incidentCategoryContent", [this.coopData.id])
+			.simplePost("rmvData", "pagePermissionConfig", [this.coopData.id])
 			.subscribe((data) => {
 				this.btnLoading = false;
 				this.delModal = false;

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

@@ -181,9 +181,6 @@
             <div class="todayNumWrap">护士端<span class="todayNum">当日建单数：{{ todayNum }}</span></div>
             <div class="updateTipsForNurses red">{{ updateTipsForNurses }}</div>
             <div class="queuingInformation" *ngIf="!updateTipsForNurses && inspectAndPatientTransportConfig.queuingInformation == 1">等待陪检：<span class="red">{{queuingInformationList[0]}}</span>&emsp;陪检中：<span class="red">{{queuingInformationList[1]}}</span></div>
-            <div class="nurseCode" (click)="showNurseCode()">
-              <i class="nurseCodeIcon icon_transport transport-erweima"></i>二维码
-            </div>
           </div>
           <div class="right">
             <div class="userInfo dropdown">
@@ -195,6 +192,8 @@
               <div class="dropdown-content r8" [hidden]="!showDropdown" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
                 <div class="dropdownItem" (click)="changeKsNow()">切换科室</div>
                 <div class="dropdownItem" (click)="showUpPwd()">修改密码</div>
+                <div class="dropdownItem" *ngIf="mainRole && loginUser.usertype.value != 1" (click)="toMain()">回到系统管理</div>
+                <div class="dropdownItem" *ngIf="mainRole && loginUser.usertype.value == 1" (click)="toOrder()">查看工单</div>
                 <div class="dropdownItem" (click)="logOut()">退出</div>
               </div>
             </div>
@@ -203,10 +202,9 @@
       </nz-header>
       <nz-content class="nzContent">
         <div class="inner-content">
-          <div class="mainInfo" nz-row>
-            <div nz-col nzSpan="17" class="cont">
+          <div class="mainInfo">
+            <div class="cont">
               <div class="top" [ngSwitch]="currentDept.typeValue">
-                <ng-container *ngIf="false">
                 <div class="nums borderB" nz-row *ngSwitchCase="'outpatientService'" hidden></div>
                 <div class="nums borderB" nz-row *ngSwitchCase="'surgery'">
                   <!-- 手术未开通 -->
@@ -349,36 +347,33 @@
                     </div>
                   </div>
                 </div>
-                <div class="nums borderB" nz-row *ngSwitchDefault>
+                <div class="nums borderB nurseNav" nz-row *ngSwitchDefault>
+                  <div class="nav">
+                    <div class="navItem" *ngFor="let item of pagePermissionConfigList">
+                      <div class="navIcon" [ngClass]="backColorComputed(item.icon.extra1)"><i class="icon_transport" [ngClass]="[item.icon.extra1]"></i></div>
+                      <div class="navContent">
+                        <h2>{{item.name}}</h2>
+                        <div class="navSpecimen" *ngIf="item.urgentFlag || item.ordinaryFlag">
+                          <span *ngIf="item.urgentFlag">急:<span class="red">{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.urgent : 0 }}</span></span>
+                          <span *ngIf="item.ordinaryFlag">普:{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.noUrgent : 0 }}</span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="nurseCode" (click)="showNurseCode()">
+                    <i class="nurseCodeIcon icon_transport transport-erweima"></i>
+                  </div>
                   <!-- 标本信息未开通 -->
-                  <div
-                    *ngIf="!deptTaskTypeRules.openSpecimen"
-                    nz-col
-                    nzSpan="13"
-                    nz-row
-                    class="h100p"
-                  >
-                    <div
-                      class="notAvailable display_flex align-items_center justify-content_flex-center"
-                    >
+                  <!-- <div *ngIf="!deptTaskTypeRules.openSpecimen" nz-col nzSpan="13" nz-row class="h100p">
+                    <div class="notAvailable display_flex align-items_center justify-content_flex-center">
                       <div>
-                        <img
-                          src="../../assets/images/icon_jianchakong.png"
-                          alt=""
-                        />
+                        <img src="../../assets/images/icon_jianchakong.png" alt="" />
                         <div>暂未开通</div>
                       </div>
                     </div>
                     <div nz-col nzSpan="18" nz-row class="borderR h100p">
-                      <div
-                        nz-col
-                        nzSpan="4"
-                        class="borderR alignC display_flex justify-content_flex-center align-items_center h100p"
-                      >
-                        <img
-                          src="../../assets/images/icon_hubiaoben.png"
-                          alt=""
-                        />
+                      <div nz-col nzSpan="4" class="borderR alignC display_flex justify-content_flex-center align-items_center h100p">
+                        <img src="../../assets/images/icon_hubiaoben.png" alt="" />
                       </div>
                       <div nz-col nzSpan="20">
                         <div class="txtC h33 borderB overAuto">*****</div>
@@ -399,59 +394,24 @@
                         <button class="btn txtC">{{ specimenButton }}</button>
                       </div>
                     </div>
-                  </div>
+                  </div> -->
                   <!-- 标本信息已开通 -->
-                  <div
-                    *ngIf="deptTaskTypeRules.openSpecimen"
-                    nz-col
-                    nzSpan="13"
-                    nz-row
-                    class="h100p"
-                  >
+                  <!-- <div *ngIf="deptTaskTypeRules.openSpecimen" nz-col nzSpan="13" nz-row class="h100p">
                     <div nz-col nzSpan="18" nz-row class="borderR h100p">
-                      <div
-                        nz-col
-                        nzSpan="4"
-                        class="borderR alignC display_flex justify-content_flex-center align-items_center h100p"
-                      >
-                        <img
-                          src="../../assets/images/icon_hubiaoben.png"
-                          alt=""
-                        />
+                      <div nz-col nzSpan="4" class="borderR alignC display_flex justify-content_flex-center align-items_center h100p">
+                        <img src="../../assets/images/icon_hubiaoben.png" alt="" />
                       </div>
                       <div nz-col nzSpan="20">
                         <div class="txtC h33 borderB overAuto">
                           {{ specimenWorkOrderMsg.specimenInfo || "" }}
                         </div>
                         <div nz-row class="h53">
-                          <div
-                            nz-col
-                            nzSpan="12"
-                            class="txtC borderR h100p cur"
-                            (click)="changeSpeDetail(1)"
-                          >
-                            <p>
-                              {{
-                                specimenWorkOrderMsg.specimenCount
-                                  ? specimenWorkOrderMsg.specimenCount.urgent
-                                  : 0
-                              }}
-                            </p>
+                          <div nz-col nzSpan="12" class="txtC borderR h100p cur" (click)="changeSpeDetail(1)">
+                            <p>{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.urgent : 0 }}</p>
                             <div>急标数量</div>
                           </div>
-                          <div
-                            nz-col
-                            nzSpan="12"
-                            class="txtC h100p cur"
-                            (click)="changeSpeDetail(0)"
-                          >
-                            <p>
-                              {{
-                                specimenWorkOrderMsg.specimenCount
-                                  ? specimenWorkOrderMsg.specimenCount.noUrgent
-                                  : 0
-                              }}
-                            </p>
+                          <div nz-col nzSpan="12" class="txtC h100p cur" (click)="changeSpeDetail(0)">
+                            <p>{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.noUrgent : 0 }}</p>
                             <div>普标数量</div>
                           </div>
                         </div>
@@ -459,118 +419,48 @@
                     </div>
                     <div nz-col nzSpan="6" class="borderR h100p">
                       <div class="quick">
-                        <button
-                          [nzLoading]="bLoading"
-                          nz-button
-                          nzType="primary"
-                          class="btn txtC"
-                          (click)="newShortcutOrder1(bbMsg, 'bb')"
-                        >
+                        <button [nzLoading]="bLoading" nz-button nzType="primary" class="btn txtC" (click)="newShortcutOrder1(bbMsg, 'bb')">
                           {{ specimenButton }}
                         </button>
-                        <!-- <button class="btn txtC" (click)="newShortcutOrder1(bbMsg,'bb',true)">
-                          收取急查标本
-                        </button> -->
                       </div>
                     </div>
-                  </div>
+                  </div> -->
 
                   <!-- 药品/静配信息未开通 -->
-                  <div
-                    *ngIf="
-                      !deptTaskTypeRules.openStaticDistribution &&
-                      !deptTaskTypeRules.openDrugsBag &&
-                      !drugJpLoading
-                    "
-                    nz-col
-                    nzSpan="11"
-                    nz-row
-                    class="h100p"
-                  >
-                    <div
-                      class="notAvailable display_flex align-items_center justify-content_flex-center"
-                    >
+                  <!-- <div *ngIf="!deptTaskTypeRules.openStaticDistribution && !deptTaskTypeRules.openDrugsBag && !drugJpLoading" nz-col nzSpan="11" nz-row class="h100p">
+                    <div class="notAvailable display_flex align-items_center justify-content_flex-center">
                       <div>
-                        <img
-                          src="../../assets/images/icon_jianchakong.png"
-                          alt=""
-                        />
+                        <img src="../../assets/images/icon_jianchakong.png" alt="" />
                         <div>暂未开通</div>
                       </div>
                     </div>
-                    <div
-                      nz-col
-                      nzSpan="6"
-                      class="borderR alignC display_flex justify-content_flex-center align-items_center h100p"
-                    >
-                      <img
-                        src="../../assets/images/icon_hujingpei.png"
-                        alt=""
-                      />
+                    <div nz-col nzSpan="6" class="borderR alignC display_flex justify-content_flex-center align-items_center h100p">
+                      <img src="../../assets/images/icon_hujingpei.png" alt="" />
                     </div>
                     <div nz-col nzSpan="18" class="h100p">
-                      <div
-                        class="txtC h50p alignC display_flex justify-content_flex-center align-items_center overAuto borderB"
-                      >
+                      <div class="txtC h50p alignC display_flex justify-content_flex-center align-items_center overAuto borderB">
                         <span>*****</span>
                       </div>
-                      <div
-                        class="txtC h50p alignC display_flex justify-content_flex-center align-items_center overAuto"
-                      >
+                      <div class="txtC h50p alignC display_flex justify-content_flex-center align-items_center overAuto">
                         <span>*****</span>
                       </div>
                     </div>
-                  </div>
+                  </div> -->
                   <!-- 药品/静配信息已开通 -->
-                  <div
-                    *ngIf="
-                      (deptTaskTypeRules.openStaticDistribution ||
-                        deptTaskTypeRules.openDrugsBag) &&
-                      !drugJpLoading
-                    "
-                    nz-col
-                    nzSpan="11"
-                    nz-row
-                    class="h100p"
-                  >
-                    <div
-                      nz-col
-                      nzSpan="6"
-                      class="borderR alignC display_flex justify-content_flex-center align-items_center h100p"
-                    >
-                      <img
-                        src="../../assets/images/icon_hujingpei.png"
-                        alt=""
-                      />
+                  <!-- <div *ngIf="(deptTaskTypeRules.openStaticDistribution || deptTaskTypeRules.openDrugsBag) && !drugJpLoading" nz-col nzSpan="11" nz-row class="h100p">
+                    <div nz-col nzSpan="6" class="borderR alignC display_flex justify-content_flex-center align-items_center h100p">
+                      <img src="../../assets/images/icon_hujingpei.png" alt="" />
                     </div>
                     <div nz-col nzSpan="18" class="h100p">
                       <div class="txtC h50p borderB">
                         <div class="swiperBox">
-                          <div
-                            class="swiper"
-                            [ngStyle]="{ top: swiperTop + 'px' }"
-                            *ngIf="
-                              jpDrugsWKOMsg.drugsInfoList &&
-                              jpDrugsWKOMsg.drugsInfoList.length > 0
-                            "
-                          >
-                            <div
-                              class="item txtC alignC display_flex justify-content_flex-center align-items_center"
-                              *ngFor="let item of jpDrugsWKOMsg.drugsInfoList"
-                            >
+                          <div class="swiper" [ngStyle]="{ top: swiperTop + 'px' }" *ngIf="jpDrugsWKOMsg.drugsInfoList && jpDrugsWKOMsg.drugsInfoList.length > 0">
+                            <div class="item txtC alignC display_flex justify-content_flex-center align-items_center" *ngFor="let item of jpDrugsWKOMsg.drugsInfoList">
                               <span>{{ item }}</span>
                             </div>
                           </div>
-                          <div
-                            class="swiper none display_flex justify-content_flex-center align-items_center"
-                            *ngIf="
-                              !jpDrugsWKOMsg.drugsInfoList ||
-                              !jpDrugsWKOMsg.drugsInfoList.length
-                            "
-                          >
-                            <div
-                              class="item alignC display_flex justify-content_flex-center align-items_center"
-                            >
+                          <div class="swiper none display_flex justify-content_flex-center align-items_center" *ngIf="!jpDrugsWKOMsg.drugsInfoList || !jpDrugsWKOMsg.drugsInfoList.length">
+                            <div class="item alignC display_flex justify-content_flex-center align-items_center">
                               <span>暂无药品配送信息</span>
                             </div>
                           </div>
@@ -578,55 +468,30 @@
                       </div>
                       <div class="txtC h50p">
                         <div class="swiperBox">
-                          <div
-                            class="swiper"
-                            [ngStyle]="{ top: swiperTop1 + 'px' }"
-                            *ngIf="
-                              jpDrugsWKOMsg.jpInfoList &&
-                              jpDrugsWKOMsg.jpInfoList.length > 0
-                            "
-                          >
-                            <div
-                              class="item txtC alignC display_flex justify-content_flex-center align-items_center"
-                              *ngFor="let item of jpDrugsWKOMsg.jpInfoList"
-                            >
+                          <div class="swiper" [ngStyle]="{ top: swiperTop1 + 'px' }" *ngIf="jpDrugsWKOMsg.jpInfoList && jpDrugsWKOMsg.jpInfoList.length > 0 ">
+                            <div class="item txtC alignC display_flex justify-content_flex-center align-items_center" *ngFor="let item of jpDrugsWKOMsg.jpInfoList">
                               <span>{{ item }}</span>
                             </div>
                           </div>
-                          <div
-                            class="swiper none display_flex justify-content_flex-center align-items_center"
-                            *ngIf="
-                              !jpDrugsWKOMsg.jpInfoList ||
-                              !jpDrugsWKOMsg.jpInfoList.length
-                            "
-                          >
-                            <div
-                              class="item alignC display_flex justify-content_flex-center align-items_center"
-                            >
-                              <!-- <span>暂无静配配送信息</span> -->
+                          <div class="swiper none display_flex justify-content_flex-center align-items_center" *ngIf="!jpDrugsWKOMsg.jpInfoList || !jpDrugsWKOMsg.jpInfoList.length">
+                            <div class="item alignC display_flex justify-content_flex-center align-items_center">
+                              <span>暂无静配配送信息</span>
                               <span></span>
                             </div>
                           </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                  <div
-                    *ngIf="drugJpLoading"
-                    nz-col
-                    nzSpan="11"
-                    nz-row
-                    class="h100p display_flex justify-content_flex-center align-items_center"
-                  >
+                  </div> -->
+                  <!-- <div *ngIf="drugJpLoading" nz-col nzSpan="11" nz-row class="h100p display_flex justify-content_flex-center align-items_center">
                     <div class="txtC" style="text-align: center">
                       <img src="../../../assets/images/loading.gif" alt="" />
                       <div>加载中...</div>
                     </div>
-                  </div>
+                  </div> -->
                 </div>
-                </ng-container>
-                <div class="tab borderB" nz-row style="padding: 4px 0">
-                  <div nz-col nzSpan="21" class="h100p">
+                <div class="tab borderB" nz-row>
+                  <div nz-col nzSpan="24" class="h100p">
                     <overlay-scrollbars #osComponentRef11 nz-row class="h100p w100">
                       <div style="height: 100%; display: flex;">
                         <ng-container *ngFor="let item of tabPermission">
@@ -657,14 +522,6 @@
                       </div>
                     </overlay-scrollbars>
                   </div>
-                  <div nz-col nzSpan="3" class="txtC h100p alignR display_flex justify-content_flex-end align-items_center">
-                    <div class="btn txtC" *ngIf="mainRole && loginUser.usertype.value != 1" (click)="toMain()">
-                      回到系统管理
-                    </div>
-                    <div class="btn txtC" *ngIf="mainRole && loginUser.usertype.value == 1" (click)="toOrder()">
-                      查看工单
-                    </div>
-                  </div>
                 </div>
               </div>
               <!-- 其他任务建单 -->
@@ -1768,7 +1625,7 @@
                 </div>
               </div>
             </div>
-            <div nz-col nzSpan="7" class="orders">
+            <div class="orders">
               <div
                 class="orderTit display_flex justify-content_space-between align-items_center"
               >
@@ -3548,4 +3405,4 @@
       </ng-template>
     </label>
   </div>
-</nz-modal>
+</nz-modal>

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

@@ -1164,24 +1164,6 @@
             line-height: normal;
             font-size: 14px;
           }
-
-          .nurseCode {
-            width: 80px;
-            height: 100%;
-            font-size: 14px;
-            color: #333;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-right: 40px;
-            cursor: pointer;
-
-            .nurseCodeIcon {
-              margin-right: 8px;
-              font-size: 24px;
-              color: #929292;
-            }
-          }
         }
 
         .right {
@@ -1212,7 +1194,7 @@
             padding: 0 24px;
             box-sizing: border-box;
             font-size: 14px;
-            border-left: 1px solid #e5e9ed;
+            // border-left: 1px solid #e5e9ed;
 
             .wel {
               line-height: 15px;
@@ -1333,6 +1315,16 @@
       .mainInfo {
         width: 100%;
         height: 100%;
+        display: flex;
+
+        .cont{
+          flex: 1;
+        }
+
+        .orders{
+          width: 354px;
+          flex-shrink: 1;
+        }
 
         & > div {
           height: 100%;
@@ -1351,9 +1343,77 @@
             z-index: 9;
 
             .nums {
-              height: 48px;
+              height: 57px;
               position: relative;
-
+              &.nurseNav{
+                display: flex;
+                align-items: center;
+                .nav{
+                  height: 100%;
+                  flex: 1;
+                  display: flex;
+                  align-items: center;
+                  gap: 24px;
+                  padding: 0 16px;
+                  .navItem{
+                    display: flex;
+                    align-items: center;
+                    cursor: pointer;
+                    .navIcon{
+                      color: #fff;
+                      border-radius: 4px;
+                      display: flex;
+                      justify-content: center;
+                      align-items: center;
+                      width: 40px;
+                      height: 40px;
+                      margin-right: 5px;
+                      .icon_transport{
+                        font-size: 32px;
+                      }
+                      &.specimen{
+                        background: linear-gradient( 41deg, #11BB87 0%, #2AC89D 47%, #45D8B5 100%);
+                      }
+                      &.blood{
+                        background: linear-gradient( 41deg, #FC985C 0%, #FAA471 50%, #FD9A5D 100%);
+                      }
+                      &.drugbag{
+                        background: linear-gradient( 41deg, #6D62FF 0%, #A089FF 100%);
+                      }
+                      &.incident{
+                        background: linear-gradient( 41deg, #2886ED 0%, #6DA5FC 100%);
+                        .icon_transport{
+                          font-size: 24px;
+                        }
+                      }
+                    }
+                    h2{
+                      font-size: 12px;
+                      font-weight: bold;
+                    }
+                    .navSpecimen{
+                      font-size: 12px;
+                      display: flex;
+                      gap: 8px;
+                    }
+                  }
+                }
+                .nurseCode {
+                  height: 100%;
+                  flex-shrink: 1;
+                  padding: 0 16px;
+                  display: flex;
+                  justify-content: space-between;
+                  align-items: center;
+                  cursor: pointer;
+                  border-left: 1px solid #ccc;
+
+                  .nurseCodeIcon {
+                    font-size: 32px;
+                    color: #929292;
+                  }
+                }
+              }
               div {
                 .h33 {
                   height: 33px;
@@ -1456,10 +1516,11 @@
             }
 
             .tab {
-              height: 60px;
-              line-height: 60px;
+              height: 40px;
+              line-height: 40px;
               cursor: default;
               overflow: hidden;
+              font-size: 18px;
 
               & /deep/ .os-scrollbar-vertical{
                 display: none!important;
@@ -1467,12 +1528,8 @@
 
               .cur {
                 height: 100%;
-                border-radius: 4px;
                 position: relative;
-                background-size: 400% 100%;
                 color: #333;
-                border: 1px solid @hs_border_color;
-                line-height: normal;
 
                 .text {
                   width: 100%;
@@ -1482,32 +1539,20 @@
                   top: 50%;
                   transform: translate(-50%, -50%);
                 }
-
-                .arrow {
-                  width: 20px;
-                  text-align: center;
-                  position: absolute;
-                  font-size: 30px;
-                  top: 45%;
-                  transform: translateY(-50%);
-                  left: 140px;
-                  /* 移动130~150px */
-                  /* 调用动画 */
-                  animation-name: arrow_move;
-                  /* 持续时间 */
-                  animation-duration: 1s;
-                  /* 无限播放 */
-                  animation-iteration-count: infinite;
-                }
-              }
-
-              & > div {
-                padding: 0 8px;
               }
 
               .checked {
-                background: @primary-color;
-                color: #fff;
+                color: @primary-color;
+                position: relative;
+                &::after{
+                  content: '';
+                  position: absolute;
+                  left: 8px;
+                  right: 8px;
+                  bottom: 0;
+                  height: 2px;
+                  background-color: @primary-color;
+                }
               }
 
               .btn {
@@ -1559,10 +1604,7 @@
           .table {
             width: 100%;
             height: 100%;
-            // position: absolute;
-            // top: 0;
-            padding: 8px;
-            // padding-top: 208px;
+            padding: 0 8px 8px;
 
             &.turn {
               padding-top: 162px;
@@ -1679,7 +1721,7 @@
             border-bottom: 1px solid @hs_border_color;
             padding: 8px;
             position: relative;
-            // z-index: 9;
+            height: 57px;
             background: #fff;
 
             & > span {
@@ -1695,7 +1737,7 @@
             height: 100%;
             position: absolute;
             top: 0;
-            padding-top: 50px;
+            padding-top: 57px;
 
             img {
               width: 20px;

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

@@ -181,6 +181,7 @@ export class HushijiandanComponent implements OnInit {
       }
     });
     this.getItsmIncident();
+    this.getPagePermissionConfigList();
     this.getInspectAndPatientTransportConfigTasktype();
     this.getUpdateTipsForNurses();
     this.getRefreshNurseWorkOrderTime();
@@ -561,6 +562,45 @@ export class HushijiandanComponent implements OnInit {
   closeExecModal() {
     this.execModal = false;
   }
+  // 快捷配置背景色
+  backColorComputed(icon){
+    if(icon === 'transport-biaobenxinxi'){
+      return 'specimen';
+    }else if(icon === 'transport-shuyeguanli'){
+      return 'blood';
+    }else if(icon === 'transport-yaopinshuju'){
+      return 'drugbag';
+    }else if(icon === 'transport-baoxiu'){
+      return 'incident';
+    }else{
+      return '';
+    }
+  }
+  // 获取快捷配置列表
+  pagePermissionConfigList: any[] = []; //表格数据
+  getPagePermissionConfigList() {
+    let data = {
+			idx: 0,
+			sum: 99999,
+			pagePermissionConfig: {
+        hosId: this.currentHospital.id,
+        active: 1,
+        taskTypeDeptId: this.loginUser.dept.id,
+      },
+		};
+		this.mainService
+			.getFetchDataList("simple/data", "pagePermissionConfig", data)
+			.subscribe((data) => {
+				let pagePermissionConfigList = data.list || [];
+        pagePermissionConfigList.forEach(v => {
+          if(v.urgentIds){
+            let urgentIds = v.urgentIds.split(',');
+            v.urgentFlag = urgentIds.some(v => v == 1);
+            v.ordinaryFlag = urgentIds.some(v => v == 2);
+          }
+        })
+			});
+  }
   // 获取系统配置
   isShowBx = false;// 护士端是否显示报修
   isAssign = false;// 是否护士指定人员