解决冲突

src/app/routes/contract-management/components/contract-frame/contract-frame.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-07 13:29:57
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:16:04
+ * @LastEditTime : 2022-02-23 16:04:18
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-frame\\contract-frame.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -36,7 +36,16 @@
         </sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button
+          nz-button
+          nzType="primary"
+          [disabled]="!sf.valid"
+          [nzLoading]="service.http.loading"
+          (click)="st?.load(1)"
+          acl
+          [acl-ability]="['CONTRACT-INDEX-listFrame']"
+          >查询</button
+        >
         <button nz-button (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
@@ -69,10 +78,10 @@
     [scroll]="{ x: '1200px', y: '370px' }"
     (change)="stChange($event)"
   >
-  <ng-template st-row="contractCode" let-item let-index="index">
-    <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
-  </ng-template>
-</st>
+    <ng-template st-row="contractCode" let-item let-index="index">
+      <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
+    </ng-template>
+  </st>
 </nz-card>
 
 <ng-template #auditModal>