优化

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

@@ -2955,7 +2955,7 @@ export class HushijiandanComponent implements OnInit {
     // 其他
     let workOrderRemark = '';
     if(otherList){
-      workOrderRemark = this.userAccount ? `${this.userAccount.account}-${this.userAccount.name}:${this.workOrderRemark}${otherList.length}本${this.otherBindConfigDto.relationTrans.name}` : this.workOrderRemark + `${otherList.length}本${this.otherBindConfigDto.relationTrans.name}`;
+      workOrderRemark = this.userAccount ? `${this.userAccount.account}-${this.userAccount.name}:${this.workOrderRemark}共${otherList.length}本${this.otherBindConfigDto.relationTrans.name}` : this.workOrderRemark + `${otherList.length}本${this.otherBindConfigDto.relationTrans.name}`;
     }else{
       workOrderRemark = this.userAccount ? `${this.userAccount.account}-${this.userAccount.name}:${this.workOrderRemark}` : this.workOrderRemark;
     }

src/app/views/limit-initiation-time/limit-initiation-time.component.html

@@ -70,7 +70,55 @@
               </nz-select>
             </nz-form-control>
           </nz-form-item>
+          <!-- new -->
           <nz-form-item>
+            <nz-form-label [nzSpan]="8" nzRequired nzFor="limitNum">是否限制发起数量</nz-form-label>
+            <nz-form-control [nzSpan]="16" nzErrorTip="请选择是否限制发起数量!">
+              <nz-radio-group formControlName="limitNum" (ngModelChange)="changeLimitNum($event)">
+                <label nz-radio [nzValue]="1">是</label>
+                <label nz-radio [nzValue]="0">否</label>
+              </nz-radio-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="limitTime">限制时间</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择限制时间!">
+              <nz-radio-group formControlName="limitTime">
+                <label nz-radio nzValue="0.5">每半小时</label>
+                <label nz-radio nzValue="1">每一小时</label>
+              </nz-radio-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
+            <nz-form-label [nzSpan]="8" nzRequired nzFor="fqLimitNum">发起限制数量</nz-form-label>
+            <nz-form-control [nzSpan]="16" nzErrorTip="请选择发起限制数量!">
+              <nz-input-number formControlName="fqLimitNum" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
+            <nz-form-label [nzSpan]="8" nzRequired nzFor="yyLimitNum">预约限制数量</nz-form-label>
+            <nz-form-control [nzSpan]="16" nzErrorTip="请选择预约限制数量!">
+              <nz-input-number formControlName="yyLimitNum" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
+            <nz-form-label [nzSpan]="24" nzRequired nzFor="createRemark"><span class="mr8">建单限制提示备注</span><span *ngFor="let item of variableNamesCreate; let last = last;" (click)="writeIn(item, $event, 'createRemark')"><strong style="cursor:pointer;color: #266CA4;">{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></nz-form-label>
+            <nz-form-control nzErrorTip="请输入建单限制提示备注!">
+              <nz-input-group>
+                <input nz-input formControlName="createRemark" placeholder="请输入建单限制提示备注" />
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
+            <nz-form-label [nzSpan]="24" nzRequired nzFor="yyLimitRemark"><span class="mr8">预约限制提示备注</span><span *ngFor="let item of variableNamesYy; let last = last;" (click)="writeIn(item, $event, 'yyLimitRemark')"><strong style="cursor:pointer;color: #266CA4;">{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></nz-form-label>
+            <nz-form-control nzErrorTip="请输入预约限制提示备注!">
+              <nz-input-group>
+                <input nz-input formControlName="yyLimitRemark" placeholder="请输入预约限制提示备注" />
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <!-- new -->
+          <nz-form-item *ngIf="validateForm.value.limitNum != 1">
             <nz-form-label [nzSpan]="8" nzRequired nzFor="limitAllDept">是否限制所有科室</nz-form-label>
             <nz-form-control [nzSpan]="16" nzErrorTip="请选择是否限制所有科室!">
               <nz-radio-group formControlName="limitAllDept" (ngModelChange)="changeLimitAllDept($event)">
@@ -141,53 +189,7 @@
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>
-          <!-- new -->
-          <nz-form-item>
-            <nz-form-label [nzSpan]="8" nzRequired nzFor="limitNum">是否限制发起数量</nz-form-label>
-            <nz-form-control [nzSpan]="16" nzErrorTip="请选择是否限制发起数量!">
-              <nz-radio-group formControlName="limitNum" (ngModelChange)="changeLimitNum($event)">
-                <label nz-radio [nzValue]="1">是</label>
-                <label nz-radio [nzValue]="0">否</label>
-              </nz-radio-group>
-            </nz-form-control>
-          </nz-form-item>
-          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
-            <nz-form-label [nzSpan]="5" nzRequired nzFor="limitTime">限制时间</nz-form-label>
-            <nz-form-control [nzSpan]="19" nzErrorTip="请选择限制时间!">
-              <nz-radio-group formControlName="limitTime">
-                <label nz-radio nzValue="0.5">每半小时</label>
-                <label nz-radio nzValue="1">每一小时</label>
-              </nz-radio-group>
-            </nz-form-control>
-          </nz-form-item>
-          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
-            <nz-form-label [nzSpan]="8" nzRequired nzFor="fqLimitNum">发起限制数量</nz-form-label>
-            <nz-form-control [nzSpan]="16" nzErrorTip="请选择发起限制数量!">
-              <nz-input-number formControlName="fqLimitNum" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
-            </nz-form-control>
-          </nz-form-item>
-          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
-            <nz-form-label [nzSpan]="8" nzRequired nzFor="yyLimitNum">预约限制数量</nz-form-label>
-            <nz-form-control [nzSpan]="16" nzErrorTip="请选择预约限制数量!">
-              <nz-input-number formControlName="yyLimitNum" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
-            </nz-form-control>
-          </nz-form-item>
-          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
-            <nz-form-label [nzSpan]="24" nzRequired nzFor="createRemark"><span class="mr8">建单限制提示备注</span><span *ngFor="let item of variableNamesCreate; let last = last;" (click)="writeIn(item, $event, 'createRemark')"><strong style="cursor:pointer;color: #266CA4;">{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></nz-form-label>
-            <nz-form-control nzErrorTip="请输入建单限制提示备注!">
-              <nz-input-group>
-                <input nz-input formControlName="createRemark" placeholder="请输入建单限制提示备注" />
-              </nz-input-group>
-            </nz-form-control>
-          </nz-form-item>
-          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
-            <nz-form-label [nzSpan]="24" nzRequired nzFor="yyLimitRemark"><span class="mr8">预约限制提示备注</span><span *ngFor="let item of variableNamesYy; let last = last;" (click)="writeIn(item, $event, 'yyLimitRemark')"><strong style="cursor:pointer;color: #266CA4;">{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></nz-form-label>
-            <nz-form-control nzErrorTip="请输入预约限制提示备注!">
-              <nz-input-group>
-                <input nz-input formControlName="yyLimitRemark" placeholder="请输入预约限制提示备注" />
-              </nz-input-group>
-            </nz-form-control>
-          </nz-form-item>
+
 
         </form>
       </div>

src/app/views/limit-initiation-time/limit-initiation-time.component.ts

@@ -57,7 +57,7 @@ export class LimitInitiationTimeComponent implements OnInit {
     });
     this.currentHospital = this.tool.getCurrentHospital();
     this.coopBtns = this.tool.initCoopBtns(this.route);
-    this.initForm();
+    // this.initForm(true);
     this.getList(1);
   }
 
@@ -199,11 +199,13 @@ export class LimitInitiationTimeComponent implements OnInit {
     this.add = true; //新增
     this.modal = true;
     this.initForm();
+    this.changeLimitType(this.validateForm.value.limitType, true);
+    this.changeLimitNum(this.validateForm.value.limitNum, true);
   }
   //关闭新增/编辑弹框
   hideAddModal() {
     this.modal = false;
-    this.initForm();
+    // this.initForm();
   }
 
   //服务时间选择
@@ -270,8 +272,6 @@ export class LimitInitiationTimeComponent implements OnInit {
       yyLimitRemark: ['', [Validators.required]],
       limitDispatchDesk: [0, [Validators.required]],
     });
-    this.changeLimitType(1, true);
-    this.changeLimitNum(0, true);
   }
 
   // 修改是否限制所有科室
@@ -311,6 +311,8 @@ export class LimitInitiationTimeComponent implements OnInit {
     }
     if(e == 1){
       //  是
+      this.validateForm.controls.limitAllDept.setValue(1);
+
       this.validateForm.get('limitTime')!.setValidators(Validators.required);
       this.validateForm.get('limitTime')!.markAsDirty();
 
@@ -429,7 +431,6 @@ export class LimitInitiationTimeComponent implements OnInit {
       .subscribe((result) => {
         this.btnLoading = false;
         this.hideAddModal();
-        this.initForm();
         if (result.status == 200) {
           if (this.add) {
             this.showPromptModal("新增", true, "");
@@ -446,6 +447,9 @@ export class LimitInitiationTimeComponent implements OnInit {
   // 编辑
   edit(data) {
     console.log(data);
+    this.initForm();
+    this.changeLimitType(data.limitType, false);
+    this.changeLimitNum(data.limitNum, false);
     this.modelName = "编辑";
     this.add = false;
     this.modal = true;