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

2022-04-29 09:39:09 +08:00
parent 3d7e576cc0 a37f26ef6c
commit ae6cb275b7
7 changed files with 64 additions and 28 deletions
--- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
@ -46,7 +46,7 @@ export class FreightAccountDetailComponent implements OnInit {
        }
      });
    }
-    // this.loadStatistics(requestOptions.body);
+    this.loadStatistics(requestOptions.body);
    return requestOptions;
  };

@ -75,6 +75,8 @@ export class FreightAccountDetailComponent implements OnInit {
  loadStatistics(params: any) {
    this.service.request(this.service.$api_get_shipper_account_balance_detail, params).subscribe(res => {
      if (res) {
+        console.log(res);
+        
        this.static = res;
      }
    });
--- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
+++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
@ -4,14 +4,14 @@
 * @Author       : Shiming
 * @Date         : 2021-12-29 14:51:07
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-08 13:21:35
+ * @LastEditTime : 2022-04-28 22:11:32
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <nz-alert nzType="info" [nzMessage]="'已选择'+ data?.ids?.length + '条订单'" nzShowIcon></nz-alert>
 <sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>

-<st #st [data]="service.$api_searchAdditionalRateBatch" [columns]="columns"
+<st #st [data]="dataList" [columns]="columns"
 [req]="{ method: 'POST',params: reqParams}"
 [res]="{ reName: { list: 'data' } }"
 [page]="{show: false,showSize: false,front: false}"
--- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
@ -1,10 +1,11 @@
+import { STComponent } from '@delon/abc/st';
 /*
 * @Description  : 
 * @Version      : 1.0
 * @Author       : Shiming
 * @Date         : 2021-12-29 14:51:07
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-08 13:21:59
+ * @LastEditTime : 2022-04-28 22:12:14
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -23,28 +24,30 @@ import { OrderManagementService } from '../../../services/order-management.servi
 })
 export class VehicleModifyRateComponent implements OnInit {
  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  @ViewChild('st', { static: false }) st!: STComponent;
  schema: SFSchema = {};
  ui: SFUISchema = {};
  columns: STColumn[] = [
    { title: '订单号', index: 'billCode' },
    { title: '原附加费率', render: 'oldAdditionalRate' },
    { title: '原附加费', render: 'oldSurcharge' },
-    // { title: '新附加费', render: 'newSurcharge' },
+    { title: '新附加费', render: 'newSurcharge' },
  ];
  aggreechecked = false;
-
+  modiUrl: string= this.service.$api_searchAdditionalRateBatch
  @Input()
  data: any;
+  dataList: any;

  constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {}

  ngOnInit(): void {
    console.log(this.data);
    this.initSF();
+    this.initData();
    console.log(this.data?.ids)
  }
  get reqParams() {
-
    return { 
      // operateObject: this.i?.resourceCode,
      // operateType: 4,
@ -52,6 +55,14 @@ export class VehicleModifyRateComponent implements OnInit {
      additionalRate: this.sf?.value?.additionalRate || 0
     };
  }
+  initData() {
+    console.log(this.reqParams);
+    
+    this.service.request(this.service.$api_searchAdditionalRateBatch, this.reqParams).subscribe((res: any) => {
+      console.log(res);
+      this.dataList = res
+    })
+  }
  initSF() {
    this.schema = {
      properties: {
@ -63,7 +74,13 @@ export class VehicleModifyRateComponent implements OnInit {
          ui: {
            unit: '%',
            widgetWidth: 200,
-            precision: 2
+            precision: 2,
+            change:(item: any) => {
+              console.log(item);
+              setTimeout(() => {
+              this.initData() 
+              });
+            }
          } as SFNumberWidgetSchema
        }
      },
--- a/src/app/routes/sys-setting/components/close-account/close-account.component.html
+++ b/src/app/routes/sys-setting/components/close-account/close-account.component.html
@ -23,7 +23,7 @@
      </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 [disabled]="false" nzType="primary" acl [acl-ability]="['SYSTEM-CLOSE-ACCOUNT-export']">导出</button>
        <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
@ -38,7 +38,7 @@

  <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-CLOSE-ACCOUNT-add']">新增结算客户</button>
    </div>
  </div>
  <st #st [data]="service.$api_settlementCustomer_page" [columns]="columns" [req]="{ params: reqParams }" [page]="{}"
--- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts
+++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts
@ -40,11 +40,13 @@ export class CloseAccountComponent implements OnInit {
      buttons: [
        {
          text: '编辑',
-          click: item => this.roleAction(item, 2)
+          click: item => this.roleAction(item, 2),
+          acl: { ability: ['SYSTEM-CLOSE-ACCOUNT-edit'] },
        },
        {
          text: '删除',
-          click: item => this.deleteAction(item)
+          click: item => this.deleteAction(item),
+          acl: { ability: ['SYSTEM-CLOSE-ACCOUNT-delete'] },
        },
      ]
    }
--- a/src/app/routes/sys-setting/sys-setting-routing.module.ts
+++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-12-03 15:23:05
- * @LastEditTime : 2022-02-23 17:17:53
+ * @LastEditTime : 2022-04-28 21:40:03
 * @LastEditors  : Shiming
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting-routing.module.ts
@ -34,7 +34,7 @@ const routes: Routes = [
  { path: 'role-management/freight/:type', component: RoleManagementComponent },
  { path: 'organization-management', component: OrganizationManagementComponent, data: { guard: { ability: ['SYSTEM-ROLE-list'] } } },
  { path: 'basic-setting', component: BasicSettingComponent, data: { guard: { ability: ['SYSTEM-BASIC_SETTING-list'] } } },
-  { path: 'note-management', component: NoTeManagementComponent },
+  { path: 'note-management', component: NoTeManagementComponent, data: { guard: { ability: ['NOTE-MANAGEMENT-search'] } }  },
  { path: 'basic-config', component: BasicConfigComponent },
  { path: 'audit-reason-config', component: AuditReasonConfigComponent },
  {
@ -52,7 +52,7 @@ const routes: Routes = [
  { path: 'crm-management', component: CrmManagementComponent, data: { guard: { ability: ['SYSTEM-CRM-list'] } } },
  { 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: 'close-account', component: CloseAccountComponent, data: { guard: { ability: ['SYSTEM-CLOSE-ACCOUNT-list'] } } },
  // { path: 'btn-management', component: BtnManagementComponent },
  { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } },
  { path: 'insurance-set', component: InsuranceSetComponent },
--- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html
+++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html
@ -19,20 +19,25 @@
 </nz-card>
 <nz-card>
  <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0">
-    <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)">
-    </nz-tab>
+    <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
  </nz-tabset>
  <!-- 数据列表 -->
-  <st #st [scroll]="{x:'1200px'}" [data]="service.$api_getInvoiceReport_page" [columns]="columns"
+  <st
+    #st
+    [scroll]="{ x: '1200px' }"
+    [data]="service.$api_getInvoiceReport_page"
+    [columns]="columns"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }"
+    [loading]="service.http.loading"
+  >
    <ng-template st-row="uploadSts" let-item let-index="index">
      <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
      <span *ngIf="item?.uploadSts == '1'">待上传</span>
      <span *ngIf="item?.uploadSts == '3'">已上传</span>
      <span *ngIf="item?.uploadSts == '2'">上传中</span>
-      <span *ngIf="item?.uploadSts == '4'" style="color: red;">上传异常</span>
+      <span *ngIf="item?.uploadSts == '4'" style="color: red">上传异常</span>
      <!-- <span  *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span> -->
    </ng-template>
    <ng-template st-row="invoiceType" let-item let-index="index">
@ -53,7 +58,17 @@
      已选择
      <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
    </div>
-    <button *ngIf="selectedIndex === '1' || selectedIndex === '4'" nz-button nzType="primary" (click)="upload()"   acl [acl-ability]="['TAX_INVOICE_REPORT-upload']">上传</button>
-    <button *ngIf="selectedIndex === '3'" nz-button nzType="primary" (click)="recall()" acl [acl-ability]="['TAX_INVOICE_REPORT-recall']">撤回</button>
+    <button
+      *ngIf="selectedIndex === '1' || selectedIndex === '4'"
+      nz-button
+      nzType="primary"
+      (click)="upload()"
+      acl
+      [acl-ability]="['TAX_INVOICE_REPORT-upload']"
+      >上传</button
+    >
+    <button *ngIf="selectedIndex === '3'" nz-button nzType="primary" (click)="recall()" acl [acl-ability]="['TAX_INVOICE_REPORT-recall']"
+      >撤回</button
+    >
  </div>
 </ng-template>