bugfix

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

@@ -137,25 +137,13 @@
 									  <nz-form-label class="label">是否开启紧急配送建单</nz-form-label>
 									  <nz-checkbox-group [(ngModel)]="item.postData.urgentCreateOrder"></nz-checkbox-group>
 									</div>
-                  <!-- 限制药单类型建单 -->
-                  <div class="display_flex align-items_center mb8">
-                    <nz-form-label class="label">限制药单类型建单</nz-form-label>
-                    <nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择限制药单类型建单" [(ngModel)]="drugsCreateLimitMarkType">
-                      <ng-container *ngFor="let option of markTypeList">
-                        <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>
-                  </div>
                 </div>
                 <!-- 自动建单配置 -->
                 <div *ngIf="tabModalName=='automaticOrderCreation'">
                   <!-- 自动建单 -->
 									<div class="display_flex align-items_center mb8">
 									  <nz-form-label class="label">是否自动建单</nz-form-label>
-									  <nz-checkbox-group [(ngModel)]="item.postData.autoCreate"></nz-checkbox-group>
+									  <nz-checkbox-group [(ngModel)]="item.postData.autoCreate" (ngModelChange)="changeAutoCreate($event, item)"></nz-checkbox-group>
 									</div>
 									<!-- 药品自动建单状态 -->
 									<div class="display_flex align-items_center mb8" *ngIf="item.postData.autoCreate[0].checked">
@@ -164,6 +152,18 @@
 										  <nz-option *ngFor="let item of drugStateData" [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
 										</nz-select>
 									</div>
+                  <!-- 限制药单类型建单 -->
+                  <div class="display_flex align-items_center mb8" *ngIf="item.postData.autoCreate[0].checked">
+                    <nz-form-label class="label">限制药单类型建单</nz-form-label>
+                    <nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择限制药单类型建单" [(ngModel)]="item.postData.drugsCreateLimitMarkType">
+                      <ng-container *ngFor="let option of markTypeList">
+                        <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>
+                  </div>
                 </div>
                 <div class="bottom">
                   <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>

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

@@ -78,7 +78,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
 				urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
-				autoCreateState: undefined // 药品自动建单状态
+				autoCreateState: undefined, // 药品自动建单状态
+				drugsCreateLimitMarkType: [], // 限制药单类型建单
 			}
     },
     {
@@ -106,7 +107,8 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
         urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
-				autoCreateState: undefined // 药品自动建单状态
+				autoCreateState: undefined, // 药品自动建单状态
+        drugsCreateLimitMarkType: [], // 限制药单类型建单
 			}
     },
     {
@@ -134,7 +136,8 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
         urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
-				autoCreateState: undefined // 药品自动建单状态
+				autoCreateState: undefined, // 药品自动建单状态
+        drugsCreateLimitMarkType: [], // 限制药单类型建单
 			}
     },
     {
@@ -162,7 +165,8 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
         urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
-				autoCreateState: undefined // 药品自动建单状态
+				autoCreateState: undefined, // 药品自动建单状态
+        drugsCreateLimitMarkType: [], // 限制药单类型建单
 			}
     },
     {
@@ -190,7 +194,8 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
         urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
-				autoCreateState: undefined // 药品自动建单状态
+				autoCreateState: undefined, // 药品自动建单状态
+        drugsCreateLimitMarkType: [], // 限制药单类型建单
 			}
     },
   ];
@@ -205,7 +210,6 @@ export class ConfigurationDrugComponent implements OnInit {
 	}
 
   // 获取药单类型
-  drugsCreateLimitMarkType:any[] = [];
 	markTypeList:any = []
 	getMarkTypeList(){
 		this.mainService.getDictionary("list", "drugsbag_mark_type").subscribe((data) => {
@@ -305,7 +309,7 @@ export class ConfigurationDrugComponent implements OnInit {
 			autoCreateState:{
 				id:this.activeDictionary.postData.autoCreateState || undefined
 			},
-      drugsCreateLimitMarkType: this.drugsCreateLimitMarkType.length ? this.drugsCreateLimitMarkType.toString() : undefined,
+      drugsCreateLimitMarkType: this.activeDictionary.postData.drugsCreateLimitMarkType.length ? this.activeDictionary.postData.drugsCreateLimitMarkType.toString() : undefined,
 		};
     this.btnLoading = true;
     this.mainService
@@ -410,8 +414,14 @@ export class ConfigurationDrugComponent implements OnInit {
 					this.activeDictionary.postData.urgentCreateOrder[0].checked = this.configs.urgentCreateOrder == 1;
 					this.activeDictionary.postData.autoCreate[0].checked = this.configs.autoCreate == 1;
 					this.activeDictionary.postData.autoCreateState = this.configs.autoCreateState && this.configs.autoCreateState.id || undefined;
-          this.drugsCreateLimitMarkType = this.configs.drugsCreateLimitMarkType ? this.configs.drugsCreateLimitMarkType.split(',').map(v => +v) : [];
+          this.activeDictionary.postData.drugsCreateLimitMarkType = this.configs.drugsCreateLimitMarkType ? this.configs.drugsCreateLimitMarkType.split(',').map(v => +v) : [];
 				}
       });
   }
+
+  // 是否自动建单
+  changeAutoCreate(e, item){
+    item.postData.autoCreateState = null;
+    item.postData.drugsCreateLimitMarkType = [];
+  }
 }

src/app/views/patient-search/patient-search.component.ts

@@ -509,9 +509,9 @@ export class PatientSearchComponent implements OnInit {
 
   // 查看日志弹窗
   logPromptModalShow = false; //弹窗开关
-  paientId = ""; //查看记录携带id
+  patientId = ""; //查看记录携带id
   showLogs(data) {
-    this.paientId = data.id;
+    this.patientId = data.id;
     this.logPromptModalShow = true;
   }
   // 关闭日志弹窗