seimin 1 年之前
父节点
当前提交
3acc852339

+ 2 - 2
src/app/share/dialog-delete/dialog-delete.component.html

@@ -23,9 +23,9 @@
23 23
       </div>
24 24
     </div>
25 25
     <div class="operate">
26
-      <button nz-button nzType="primary" (click)="cancel('cancel')" *ngIf="isShowConfirmInfo">知道了</button>
26
+      <button nz-button nzType="primary" (click)="cancel('cancel')" *ngIf="!isShowConfirm">知道了</button>
27 27
       <button nz-button nzType="primary" (click)="confirmDel()" [nzLoading]="btnLoading" *ngIf="isShowConfirm">{{confirmTxt}}</button>
28
-      <button *ngIf="!isShowConfirmInfo" class="btn cancel ml8" nz-button nzType="default" (click)="cancel(cancelTxt=='否'?'no':'cancel')" [nzLoading]="cancenlLoading">{{cancelTxt}}</button>
28
+      <button *ngIf="isShowConfirm" class="btn cancel ml8" nz-button nzType="default" (click)="cancel(cancelTxt=='否'?'no':'cancel')" [nzLoading]="cancenlLoading">{{cancelTxt}}</button>
29 29
     </div>
30 30
   </div>
31 31
 </div>

+ 1 - 1
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -3121,7 +3121,7 @@ export class HushijiandanComponent implements OnInit {
3121 3121
           this.limitTimeItem = {taskTypeId, fun1, fun2};
3122 3122
           this.limitTimeInfo = data.data.remark;
3123 3123
           this.isShowConfirm = data.data.limitType == 1;
3124
-          if(this.isShowConfirm){
3124
+          if(this.isShowConfirm || data.data.limitNum == 1){
3125 3125
             this.isShowConfirmInfo = '';
3126 3126
           }else{
3127 3127
             this.isShowConfirmInfo = '请在规定时间内下单';