拉取代码

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

@@ -4,14 +4,14 @@
       <div class="contentBody2">
         <div class="TaskTypeManagement">
           <div class="taskTypeInfo">
-<!--            <div class="top">
+           <div class="top">
               <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
-                特性配置
+                {{hosName}}
               </div>
-              <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+          <!--    <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
                 自动建单配置
-              </div>
-            </div> -->
+              </div> -->
+            </div>
             <div class="list" *ngIf="!loading">
               <!-- 动态数字密钥 -->
               <div>

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

@@ -263,7 +263,7 @@
 
         & > div {
           border-right: 1px solid #e5e9ed;
-          width: 30%;
+          width: 100%;
           text-align: center; // display: flex;
           // align-items: center;
           cursor: pointer;

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

@@ -15,7 +15,7 @@ export class ConfigurationKeyComponent implements OnInit {
   btnLoading:boolean = false; //提交按钮的loading
   tabModalName:string = 'characteristics'; //当前选中的tab
   hosId = this.tool.getCurrentHospital().id; //当前院区
-
+	hosName = this.tool.getCurrentHospital().hosName //当前院区名称
   // 数字密钥
   returnSpecimenWhetherHandover:any[] = [
     {label:'是否开启',value: 0}

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

@@ -1,8 +1,13 @@
 <div class="content specimen">
   <div class="contentInner">
+		<div class="address">
+		  <overlay-scrollbars #osComponentRef1 class="contentBody">
+		    <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.key == activeDictionaryKey }" (click)="clickDictionaryKey(item)" *ngFor="let item of dictionaryKeyList">{{ item.name }}</div>
+		  </overlay-scrollbars>
+		</div>
     <div class="addressAssign">
       <div class="contentBody2">
-        <div class="TaskTypeManagement">
+        <div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='examine'">
           <div class="taskTypeInfo">
             <div class="top">
               <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
@@ -99,6 +104,18 @@
             </div>
           </div>
         </div>
+				<div *ngIf="activeDictionaryKey=='pathology'">
+					<div class="list">
+						<!--是否支持根据手术新建申请单 -->
+						<div class="display_flex align-items_center mb8">
+						  <nz-form-label class="label">是否支持根据手术新建申请单</nz-form-label>
+						  <nz-checkbox-group [(ngModel)]="support"></nz-checkbox-group>
+						</div>
+						<div class="bottom">
+						  <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitPathologyForm()">保存</button>
+						</div>
+					</div>
+				</div>
       </div>
     </div>
   </div>

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

@@ -19,25 +19,25 @@
     flex: 1;
     min-height: 0;
     display: flex;
-    flex-direction: column;
+    // flex-direction: column;
     justify-content: space-between;
     border: 1px solid #EEF3F9;
     &.specimen{
       margin: 24px 24px 0;
       background-color: #fff;
       .contentInner{
-        padding: 40px 158px 72px;
+        // 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;
+          // flex: 1;
+          // display: flex;
+          // flex-direction: column;
+          // align-items: center;
+          padding: 16px;
           gap: 32px;
         }
         .hospital{
@@ -52,23 +52,24 @@
       }
     }
     .contentItem{
-      padding: 4px 16px;
+      padding: 8px;
       cursor: pointer;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
+			margin: 0 16px;
       &.active{
-        color: @primary-color;
-        background-color: #F0F6ED;
+        color: #fff;
+        background-color: #49b856;
         border-radius: 4px;
       }
     }
     .contentInner{
       flex: 1;
       display: flex;
-      flex-direction: column;
+      // flex-direction: column;
       align-items: center;
-      padding: 0 16px;
+      // padding: 0 16px;
       gap: 32px;
       .contentHead{
         height: 45px;
@@ -101,13 +102,13 @@
         flex: 1;
         height: 100%;
         background: #FFFFFF;
-        border: 1px solid #E8EBEF;
+        // border: 1px solid #E8EBEF;
         display: flex;
-        flex-direction: column;
+        // flex-direction: column;
         width: 0;
       }
       .addressAssign{
-        flex: 3;
+        flex: 7;
         height: 100%;
         background: #FFFFFF;
         border: 1px solid #E8EBEF;

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

@@ -15,7 +15,22 @@ export class ConfigurationSpecimenComponent implements OnInit {
   btnLoading:boolean = false; //提交按钮的loading
   tabModalName:string = 'characteristics'; //当前选中的tab
   hosId = this.tool.getCurrentHospital().id; //当前院区
-
+	
+	// tab类型
+	dictionaryKeyList:any[] = [
+		{
+			name:'检查标本',key:'examine'
+		},
+		{
+			name:'病理标本',key:'pathology'
+		}
+	];
+	
+	// 扫描时指定科室不提醒勾选项
+	support:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	
   // 扫描时指定科室不提醒勾选项
   deptNotAlert:any[] = [
     {label:'是否开启',value: 0}
@@ -77,7 +92,15 @@ export class ConfigurationSpecimenComponent implements OnInit {
     this.getDeptList();
     this.getTaskType();
   }
-
+	
+	// 点击数据字典key
+	activeDictionaryKey:any = 'examine';
+	clickDictionaryKey(item){
+	  this.activeDictionaryKey = item.key;
+	  this.getDeptList();
+	  this.getTaskType();
+	}
+	
   // 扫描时指定科室不提醒勾选项
   changeDeptNotAlert(e){
     console.log(e);
@@ -135,7 +158,27 @@ export class ConfigurationSpecimenComponent implements OnInit {
   tabModal(tabModalName:string){
     this.tabModalName = tabModalName;
   }
-  // 保存
+	
+	//病理标本保存
+	submitPathologyForm(){
+		let postData:any = {
+		  id: this.configs.id,
+		  taskType: this.tasktype.id,
+		  hosId: this.hosId,
+		  support: this.deptNotAlert[0].checked ? 1 : 0,
+		};
+		this.btnLoading = true;
+		this.mainService
+		  .simplePost("addData", "taskTypeConfig", postData)
+		  .subscribe((result) => {
+		    this.btnLoading = false;
+		    if (result.status == 200) {
+		      this.getConfig();
+		    }
+		  });
+	}
+	
+  // 检查标本保存
   submitForm() {
     if(!this.tasktype.id){
       this.msg.create("warning", "请先配置患者陪检任务类型！");
@@ -218,6 +261,9 @@ export class ConfigurationSpecimenComponent implements OnInit {
         this.loading = false;
         if (result.status == 200) {
           this.configs = result.list[0] || {};
+					// 病理标本
+					this.support[0].checked = this.configs.support == 1;
+					// 检查标本
           this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
           this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
           this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;