Merge branch 'develop'

2022-04-28 18:58:01 +08:00
parent 6d5b8b32d2 60c5d15564
commit 9eeeca210e
13 changed files with 88 additions and 63 deletions
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
@ -273,6 +273,7 @@ export class PayableOrderComponent implements OnInit {
        buttons: [
          {
            text: '浏览',
+            acl: { ability: ['FINANCIAL-PAYABLE-view'] },
            click: item =>
              this.router.navigate(['/financial-management/payable-order/detail/' + item.id], { queryParams: { billHId: item.id } })
          }
--- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html
+++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html
@ -40,7 +40,8 @@
        <label class="page_title"> <label class="driver">|</label> 充值记录</label>
        <div class="mr-sm">
            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
-            <button nz-button nzDanger (click)="exportList()"> 导出</button>
+            <button nz-button nzDanger (click)="exportList()" acl [acl-ability]="['FINANCIAL-RECHARGE-export']">
+                导出</button>
        </div>
    </div>
    <st #st [data]="service.$api_get_recharge_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
--- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
+++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
@ -119,7 +119,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn
          title: '账户名称',
          ui: {
            placeholder: '请输入',
-            autocomplete: 'off',
+            autocomplete: 'off'
          }
        },
        accountType: {
@ -133,7 +133,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn
          ],
          ui: {
            widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
          },
          default: ''
        },
@ -157,7 +157,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn
          ],
          ui: {
            widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
          },
          default: ''
        }
@ -195,6 +195,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn
          { type: 'divider' },
          {
            text: '查看回单<br>',
+            acl: { ability: ['FINANCIAL-RECHARGE-receiptApply'] },
            click: item =>
              this.service.getReceiptUrl(item.receiptUrl, {
                bankType: item.bankType,
@ -207,6 +208,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn
          },
          {
            text: '添加备注',
+            acl: { ability: ['FINANCIAL-RECHARGE-addRemark'] },
            click: item => this.addRemark(item)
          }
        ]
--- a/src/app/routes/financial-management/financial-managemen-routing.module.ts
+++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts
@ -50,11 +50,11 @@ const routes: Routes = [
    component: PlatformAccountDetailComponent,
    data: { guard: { ability: ['FINANCIAL-PLATFORM-DETAIL-detail'] } }
  },
-  { path: 'recharge-record', component: RechargeRecordComponent },
+  { path: 'recharge-record', component: RechargeRecordComponent, data: { guard: { ability: ['FINANCIAL-RECHARGE-list'] } } },
  { path: 'withdrawals-record', component: WithdrawalsRecordComponent },
  { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent },
  { path: 'refund-record', component: RefundRecordComponent },
-  { path: 'voucher-management', component: VoucherManagementComponent },
+  { path: 'voucher-management', component: VoucherManagementComponent, data: { guard: { ability: ['FINANCIAL-VOUCHER-list'] } } },
  { path: 'voucher-management/detail/:id', component: VoucherDetailComponent },
  { path: 'voucher-summary', component: VoucherSummaryComponent, data: { guard: { ability: ['FINANCIAL-VOUCHER-SUMMARY-list'] } } },
  { path: 'voucher-summary/detail/:id', component: SummaryDetailComponent },
--- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html
+++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html
@ -1,4 +1,17 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-21 13:49:22
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-28 17:40:42
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\assigned-car\\assigned-car.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<nz-spin [nzSpinning]="service.http.loading">
+
 <div>
+
  <div nz-row>
    <div nz-col nzSpan="18">
      <sf #sf [schema]="schema" mode="search" [ui]="ui" [compact]="true" (formSubmit)="st.load(1)"
@ -41,9 +54,12 @@
      </ng-template>
    </st>
  </div>
-  <div class="modal-footer">
-    <button nz-button type="button" (click)="close()">关闭</button>
-    <button nz-button type="submit" nzType="primary" (click)="verifyVechicleStatus(params)" [disabled]="!selectedRows"
-      [nzLoading]="service.http.loading">发布并指派给司机</button>
-  </div>
+
 </div>
+</nz-spin >
+
+<div class="modal-footer">
+  <button nz-button type="button" (click)="close()">关闭</button>
+  <button nz-button type="submit" nzType="primary" (click)="verifyVechicleStatus(params)" [disabled]="!selectedRows"
+    [nzLoading]="service.http.loading">发布并指派给司机</button>
+</div>
--- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html
+++ b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html
@ -4,12 +4,13 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 14:27:20
+ * @LastEditTime : 2022-04-28 17:36:31
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\choose-famifiar\\choose-famifiar.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <!-- <button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()"><i nz-icon nzType="plus"></i>添加司机</button> -->
 <!-- 搜索区 -->
+<nz-spin [nzSpinning]="service.http.loading">
 <div nz-row nzGutter="8">
  <div nz-col [nzSpan]="18">
    <sf #sf [ui]="ui" [schema]="schema" [button]="'none'"></sf>
@ -19,6 +20,7 @@
    <button nz-button (click)="resetSF()">重置</button>
  </div>
 </div>
+
 <div nz-row nzGutter="8">
  <div nz-col [nzSpan]="12">
    <!-- 数据列表 -->
@ -55,7 +57,9 @@
    </st>
  </div>
 </div>
+</nz-spin>
+
 <div *nzModalFooter>
  <button nz-button nzType="default" (click)="cancel()">取消</button>
  <button nz-button nzType="primary" (click)="ok()">发布并指派给司机</button>
-</div>
+</div>
--- a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html
+++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html
@ -25,8 +25,10 @@
        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-        <button nz-button [disabled]="false" nzType="primary">导出</button>
+        <button nz-button nzType="primary" acl [acl-ability]="['SYSTEM-ANNOUNCEMENT-list']"
+          [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button [disabled]="false" nzType="primary" acl
+          [acl-ability]="['SYSTEM-ANNOUNCEMENT-export']">导出</button>
        <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
@ -40,7 +42,8 @@
 <nz-card class="content-box">
  <div class="d-flex justify-content-end mb-sm mt-sm">
    <div>
-      <button nz-button nzType="primary" (click)="roleAction('', 1)">新增公告</button>
+      <button nz-button nzType="primary" (click)="roleAction('', 1)" acl
+        [acl-ability]="['SYSTEM-ANNOUNCEMENT-add']">新增公告</button>
    </div>
  </div>
  <st #st [data]="service.$api_getAnnouncementInfoList_page" [columns]="columns" [req]="{  params: reqParams }"
--- a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
+++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
@ -39,10 +39,12 @@ export class AnnouncementMessageComponent implements OnInit {
      buttons: [
        {
          text: '编辑',
+          acl: { ability: ['SYSTEM-ANNOUNCEMENT-edit'] },
          click: item => this.roleAction(item, 2)
        },
        {
          text: '删除',
+          acl: { ability: ['SYSTEM-ANNOUNCEMENT-delete'] },
          click: item => this.deleteAction(item)
        },
      ]
--- a/src/app/routes/sys-setting/sys-setting-routing.module.ts
+++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts
@ -54,7 +54,7 @@ const routes: Routes = [
  { path: 'network-freight/new/:id', component: NetworkFreightNewComponent },
  { path: 'close-account', component: CloseAccountComponent },
  // { path: 'btn-management', component: BtnManagementComponent },
-  { path: 'announcement-message', component: AnnouncementMessageComponent },
+  { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } },
  { path: 'insurance-set', component: InsuranceSetComponent },
  { path: 'sms-template', component: SmsTemplateComponent, data: { guard: { ability: ['SMS_TEMPLATE-search'] } } }
 ];
--- a/src/app/routes/tax-management/tax-management-routing.module.ts
+++ b/src/app/routes/tax-management/tax-management-routing.module.ts
@ -1,5 +1,5 @@
 /*
- * @Description  : 
+ * @Description  :
 * @Version      : 1.0
 * @Author       : Shiming
 * @Date         : 2022-03-30 13:58:28
@ -16,18 +16,20 @@ import { TaxManagementIndividualIncomeComponent } from './components/individual-
 import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component';
 import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';

-
 const routes: Routes = [
-  { path: 'orderReport', component: TaxManagementOrderReportingComponent },
-  { path: 'income', component: TaxManagementIndividualIncomeComponent },
-  { path: 'collect', component: TaxManagementIndividualCollectComponent },
-  { path: 'declare', component: TaxManagementIndividualDeclareComponent },
-  { path: 'invoiceReport', component: TaxManagementInvoiceReportingComponent },
+  { path: 'orderReport', component: TaxManagementOrderReportingComponent, data: { guard: { ability: ['TAX-ORDERREPORT-search'] } } },
+  { path: 'income', component: TaxManagementIndividualIncomeComponent, data: { guard: { ability: ['TAX-INCOME-search'] } } },
+  { path: 'collect', component: TaxManagementIndividualCollectComponent, data: { guard: { ability: ['TAX-COLLECT-search'] } } },
+  { path: 'declare', component: TaxManagementIndividualDeclareComponent, data: { guard: { ability: ['TAX-DECLARE-search'] } } },
+  {
+    path: 'invoiceReport',
+    component: TaxManagementInvoiceReportingComponent,
+    data: { guard: { ability: ['TAX_INVOICE_REPORT-list'] } }
+  }
 ];
-  

@NgModule({
  imports: [RouterModule.forChild(routes)],
  exports: [RouterModule]
 })
-export class TaxManagementModuleRoutingModule { }
+export class TaxManagementModuleRoutingModule {}
--- a/src/app/routes/usercenter/usercenter-routing.module.ts
+++ b/src/app/routes/usercenter/usercenter-routing.module.ts
@ -71,7 +71,7 @@ const routes: Routes = [
  {
    path: 'driver/config',
    component: UserCenterComponentsDriverConfigComponent,
-    data: { guard: { ability: ['USERCENTER-DRIVER-CAPTAIN-list'] } }
+    data: { guard: { ability: ['USERCENTER-DRIVER-CONFIG-search'] } }
  }
 ];

--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@ -16,17 +16,10 @@
      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
    </div>
    <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-      <button
-        nz-button
-        nzType="primary"
-        acl
-        [acl-ability]="['VEHICLE-LIST-search']"
-        [nzLoading]="service.http.loading"
-        (click)="st?.load(1)"
-        >查询</button>
-      <button nz-button nzType="primary" [disabled]="false" (click)="exportFire()" acl [acl-ability]="'VEHICLE-LIST-export'"
-        >导出</button
-      >
+      <button nz-button nzType="primary" acl [acl-ability]="['VEHICLE-LIST-search']" [nzLoading]="service.http.loading"
+        (click)="st?.load(1)">查询</button>
+      <button nz-button nzType="primary" [disabled]="false" (click)="exportFire()" acl
+        [acl-ability]="'VEHICLE-LIST-export'">导出</button>
      <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
      <button nz-button nzType="link" (click)="expandToggle()">
        {{ !_$expand ? '展开' : '收起' }}
@ -38,23 +31,14 @@
 <nz-card>
  <!-- 数据列表 -->

-  <st
-    #st
-    [bordered]="true"
-    [scroll]="{ x: '1200px' }"
-    [columns]="columns"
-    [data]="service.$api_get_operate_list"
+  <st #st [bordered]="true" [scroll]="{ x: '1200px' }" [columns]="columns" [data]="service.$api_get_operate_list"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loading]="false"
-  >
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
    <ng-template st-row="carLength" let-item let-index="index">
-      <div
-        >{{ item?.carModelLabel }}-{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
-          item?.carLoad ? item?.carLoad + '吨' : ''
-        }}</div
-      >
+      <div>{{ item?.carModelLabel }}-{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
+        item?.carLoad ? item?.carLoad + '吨' : ''
+        }}</div>
    </ng-template>
    <ng-template st-row="isSelf" let-item let-index="index">
      <div>
@ -68,13 +52,19 @@
    </ng-template>
    <ng-template st-row="approvalAuditStatus" let-item let-index="index">
      <div>
-        <span *ngIf="item?.approvalAuditStatus === -1 || (item?.approvalAuditStatus === '-1' && item?.isSelf)">未上传</span>
+        <span
+          *ngIf="item?.approvalAuditStatus === -1 || (item?.approvalAuditStatus === '-1' && item?.isSelf)">未上传</span>
        <span *ngIf="item?.approvalAuditStatus === 0 || (item?.approvalAuditStatus === '0' && item?.isSelf)">草稿</span>
-        <span *ngIf="item?.approvalAuditStatus === 10 || (item?.approvalAuditStatus === '10' && item?.isSelf)">待审核</span>
-        <span *ngIf="item?.approvalAuditStatus === 15 || (item?.approvalAuditStatus === '15' && item?.isSelf)">已撤销</span>
-        <span *ngIf="item?.approvalAuditStatus === 20 || (item?.approvalAuditStatus === '20' && item?.isSelf)">已审核</span>
-        <span *ngIf="item?.approvalAuditStatus === 30 || (item?.approvalAuditStatus === '30' && item?.isSelf)">已驳回</span>
-        <span *ngIf="item?.approvalAuditStatus === 40 || (item?.approvalAuditStatus === '40' && item?.isSelf)">证件过期</span>
+        <span
+          *ngIf="item?.approvalAuditStatus === 10 || (item?.approvalAuditStatus === '10' && item?.isSelf)">待审核</span>
+        <span
+          *ngIf="item?.approvalAuditStatus === 15 || (item?.approvalAuditStatus === '15' && item?.isSelf)">已撤销</span>
+        <span
+          *ngIf="item?.approvalAuditStatus === 20 || (item?.approvalAuditStatus === '20' && item?.isSelf)">已审核</span>
+        <span
+          *ngIf="item?.approvalAuditStatus === 30 || (item?.approvalAuditStatus === '30' && item?.isSelf)">已驳回</span>
+        <span
+          *ngIf="item?.approvalAuditStatus === 40 || (item?.approvalAuditStatus === '40' && item?.isSelf)">证件过期</span>
        <span *ngIf="!item?.isSelf">-</span>
      </div>
    </ng-template>
@ -83,4 +73,4 @@
      <nz-tag *elseBlock nzColor="success">正常</nz-tag>
    </ng-template>
  </st>
-</nz-card>
+</nz-card>
--- a/src/app/routes/vehicle/vehicle-routing.module.ts
+++ b/src/app/routes/vehicle/vehicle-routing.module.ts
@ -14,10 +14,14 @@ import { VehicleComponentsListDetailComponent } from './components/list/detail/d
 import { VehicleComponentsListComponent } from './components/list/list.component';

 const routes: Routes = [
-  { path: 'list', component: VehicleComponentsListComponent },
-  { path: 'list/detail/:id', component: VehicleComponentsListDetailComponent },
-  { path: 'audit', component: VehicleComponentsAuditComponent },
-  { path: 'audit/detail/:id', component: VehicleComponentsAuditDetailComponent }
+  { path: 'list', component: VehicleComponentsListComponent, data: { guard: { ability: ['VEHICLE-LIST-search'] } } },
+  { path: 'list/detail/:id', component: VehicleComponentsListDetailComponent, data: { guard: { ability: ['VEHICLE-LIST-DETAIL-list'] } } },
+  { path: 'audit', component: VehicleComponentsAuditComponent, data: { guard: { ability: ['VEHICLE-AUDIT-search'] } } },
+  {
+    path: 'audit/detail/:id',
+    component: VehicleComponentsAuditDetailComponent,
+    data: { guard: { ability: ['VEHICLE-AUDIT-DETAIL-search'] } }
+  }
 ];

@NgModule({