Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/financial-management/components/payment-order/payment-order.component.html

@@ -32,7 +32,8 @@
             </label>
         </div>
         <div class="mr-sm">
-            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
+                [acl-ability]="['FINANCIAL-RECEIPT-list']">筛选</button>
         </div>
     </div>
 

src/app/routes/financial-management/financial-managemen-routing.module.ts

@@ -60,9 +60,9 @@ const routes: Routes = [
   { path: 'abnormal-gold/detail/:id', component: AbnormalGoldDetailComponent },
   { path: 'payment-record', component: PaymentRecordComponent },
   { path: 'transaction-flow', component: TransactionFlowComponent },
-  { path: 'payment-order', component: PaymentOrderComponent },
+  { path: 'payment-order', component: PaymentOrderComponent, data: { guard: { ability: ['FINANCIAL-PAYMENT-ORDER-list'] } } },
   { path: 'payment-order/detail/:id', component: PaymentOrderDetailComponent },
-  { path: 'receipt-order', component: ReceiptOrderComponent },
+  { path: 'receipt-order', component: ReceiptOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIPT-list'] } } },
   { path: 'receipt-order/detail/:id', component: ReceiptOrderDetailComponent },
   { path: 'advance-collection', component: AdvanceCollectionComponent },
   { path: 'advance-collection/detail/:id', component: AdvanceCollectionDetailComponent },
@@ -70,8 +70,7 @@ const routes: Routes = [
   { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent },
   { path: 'payable-order', component: PayableOrderComponent },
   { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent },
-  { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent },
+  { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent }
-
 ];
 
 @NgModule({

src/app/routes/sys-setting/components/agreement-config/agreement-config.component.html

@@ -19,7 +19,8 @@
           更新时间： {{ tabItem.modifyTime }}
           <a style="margin-left: 8px" target="_blank" [queryParams]="{ type: tabItem.type }"
             [routerLink]="['/passport/agreement']">预览</a>
-          <button nz-button nzType="link" (click)="update()">修改</button>
+          <button nz-button nzType="link" (click)="update()" acl
+            [acl-ability]="['SYSTEM-AGREEMENT-CONFIG-save']">修改</button>
         </div>
         <div [innerHTML]="tabItem.agreementContent | safehtml"></div>
       </nz-card>

src/app/routes/sys-setting/sys-setting-routing.module.ts

@@ -29,20 +29,28 @@ import { SmsTemplateComponent } from './components/sms-template/sms-template.com
 import { OrganizationManagementComponent } from './components/organization-management/organization-management.component';
 
 const routes: Routes = [
-  { path: 'staff-management', component: StaffManagementComponent },
+  { path: 'staff-management', component: StaffManagementComponent, data: { guard: { ability: ['SYSTEM-STAFF-list'] } } },
   { path: 'role-management/user/:type', component: RoleManagementComponent },
   { path: 'role-management/freight/:type', component: RoleManagementComponent },
-  { path: 'organization-management', component: OrganizationManagementComponent },
+  { path: 'organization-management', component: OrganizationManagementComponent, data: { guard: { ability: ['SYSTEM-ROLE-list'] } } },
-  { path: 'basic-setting', component: BasicSettingComponent },
+  { path: 'basic-setting', component: BasicSettingComponent, data: { guard: { ability: ['SYSTEM-BASIC_SETTING-list'] } } },
   { path: 'note-management', component: NoTeManagementComponent },
   { path: 'basic-config', component: BasicConfigComponent },
   { path: 'audit-reason-config', component: AuditReasonConfigComponent },
-  { path: 'cart-config', component: CartConfigComponent },
+  {
-  { path: 'agreement-config', component: AgreementConfigComponentsBaseComponent },
+    path: 'cart-config',
+    component: CartConfigComponent,
+    data: { guard: { ability: ['SYSTEM-CART-CONFIG-modeList', 'SYSTEM-CART-CONFIG-cartLength', 'SYSTEM-CART-CONFIG-goodsList'] } }
+  },
+  {
+    path: 'agreement-config',
+    component: AgreementConfigComponentsBaseComponent,
+    data: { guard: { ability: ['SYSTEM-AGREEMENT-CONFIG-list'] } }
+  },
   { path: 'system-config', component: SystemConfigComponent },
-  { path: 'goods-name-config', component: GoodsNameConfigComponent },
+  { path: 'goods-name-config', component: GoodsNameConfigComponent, data: { guard: { ability: ['SYSTEM-GOODS-NAME-CONFIG-list'] } } },
-  { path: 'crm-management', component: CrmManagementComponent },
+  { path: 'crm-management', component: CrmManagementComponent, data: { guard: { ability: ['SYSTEM-CRM-list'] } } },
-  { path: 'network-freight', component: NetworkFreightComponent },
+  { path: 'network-freight', component: NetworkFreightComponent, data: { guard: { ability: ['SYSTEM-NETWORK-FREIGHT-list'] } } },
   { path: 'network-freight/new/:id', component: NetworkFreightNewComponent },
   { path: 'close-account', component: CloseAccountComponent },
   // { path: 'btn-management', component: BtnManagementComponent },

src/app/routes/usercenter/components/freight/list/detail/detail.component.html

@@ -16,8 +16,8 @@
                 <p style="margin-bottom: 0;word-break:break-all">{{ detailData?.enterpriseName }}</p>
               </div>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"></nz-badge>
+                <nz-badge nzStatus="success" nzText="正常" *ngIf="!detailData?.stateLocked"></nz-badge>
-                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
+                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked"></nz-badge>
               </div>
             </div>
             <div nz-row>
@@ -48,30 +48,30 @@
               保存
             </button>
             <button [disabled]="false" nz-button nzDanger (click)="auditPass(true)"
-              *ngIf="detailData?.approvalStatus===10" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
+              *ngIf="detailData?.approvalStatus===10" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass']">
               通过
             </button>
           </ng-container>
           <ng-template #editButton>
             <ng-container *ngIf="detailData?.approvalStatus===10">
               <button [disabled]="false" nz-button nzDanger (click)="auditPass(false)" acl
-                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
+                [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass']">
                 通过
               </button>
               <button [disabled]="false" nz-button nzDanger (click)="auditNo()" acl
-                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
+                [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass']">
                 驳回
               </button>
             </ng-container>
             <ng-container *ngIf="detailData?.approvalStatus!=10">
               <button [disabled]="false" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
                 (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"
-                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
+                acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
                 启用
               </button>
               <button [disabled]="false" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
                 (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"
-                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
+                acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
                 冻结
               </button>
               <button [disabled]="false" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payfrozen"
@@ -84,7 +84,7 @@
               </button>
             </ng-container>
             <button [disabled]="false" nz-button nzDanger (click)="ratify()" acl
-              [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-save']">
+              [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-save']">
               修改
             </button>
           </ng-template>