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

src/app/routes/datatable/components/dataindex/dataindex.component.html

@@ -19,7 +19,7 @@
         </p>
       </ng-template>
       <ng-template #AdvanceDepositFooter>
-        <g2-custom #AdvanceDeposit delay="100"></g2-custom>
+        <g2-custom #AdvanceDeposit></g2-custom>
         <!-- <g2-mini-area line color="#cceafe" height="45" [data]="totalAdvanceDeposit?.list || []"
           (clickItem)="handleClick($event)">
         </g2-mini-area> -->
@@ -75,12 +75,12 @@
 </div>
 <div nz-row [nzGutter]="16">
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <nz-card  acl  [acl-ability]="['dataindex-getBillTypeProportion']"><label class="chart_title">订单类型比例</label>
+    <nz-card acl [acl-ability]="['dataindex-getBillTypeProportion']"><label class="chart_title">订单类型比例</label>
       <g2-custom #g2custom delay="100"></g2-custom>
     </nz-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="18">
-    <nz-card  acl  [acl-ability]="['dataindex-getBillAmount']"><label class="chart_title">大区业绩完成情况</label>
+    <nz-card acl [acl-ability]="['dataindex-getBillAmount']"><label class="chart_title">大区业绩完成情况</label>
       <!-- <g2-timeline [data]="chartData" [titleMap]="{ y1: '订单金额（元）', y2: '' }" [height]="200" mask="MM月DD日"
         [slider]="false"></g2-timeline> -->
       <g2-custom #RegionalPerforman delay="100"></g2-custom>
@@ -89,7 +89,7 @@
 </div>
 <div nz-row [nzGutter]="16">
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <nz-card  acl  [acl-ability]="['dataindex-getWayBillDirectProportion']"> <label class="chart_title">运单直付比例</label>
+    <nz-card acl [acl-ability]="['dataindex-getWayBillDirectProportion']"> <label class="chart_title">运单直付比例</label>
       <!-- <g2-pie #pie title="销售额" subTitle="销售额" [total]="total" [valueFormat]="format" [data]="salesPieData" height="294"
         (clickItem)="handleClick($event)" [lineWidth]="10">
       </g2-pie> -->
@@ -97,7 +97,7 @@
     </nz-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="18">
-    <nz-card  acl  [acl-ability]="['dataindex-getBillPaymentAmount']">
+    <nz-card acl [acl-ability]="['dataindex-getBillPaymentAmount']">
       <label class="chart_title">业绩完成情况</label>
       <!-- <g2-bar  [data]="salesData" (clickItem)="handleClick($event)" height="400"></g2-bar> -->
       <g2-custom #SaleProportion delay="100"></g2-custom>

src/app/routes/datatable/components/dataindex/dataindex.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area';
 import { G2PieClickItem, G2PieComponent, G2PieData } from '@delon/chart/pie';
@@ -18,7 +18,7 @@ import { GeometryLabelCfg } from '@antv/g2/lib/interface';
   styleUrls: ['./dataindex.component.less'],
   providers: [CurrencyPipe]
 })
-export class DatatableDataindexComponent implements OnInit {
+export class DatatableDataindexComponent implements OnInit, AfterViewInit {
   @ViewChild('AdvanceDeposit', { static: false }) AdvanceDeposit!: G2CustomComponent;
   @ViewChild('g2custom', { static: false }) g2custom!: G2CustomComponent;
   @ViewChild('RegionalPerforman', { static: false }) RegionalPerforman!: G2CustomComponent;
@@ -38,13 +38,16 @@ export class DatatableDataindexComponent implements OnInit {
 
   regionalPerformanceCompletion: DataPerformanceTrendVO[] = [];
 
-  constructor(private service: DataService, private currency: CurrencyPipe) {}
+  constructor(private service: DataService, private currency: CurrencyPipe) { }
-
+  ngAfterViewInit(): void {
-  ngOnInit(): void {
     this.initMiniAreaData();
     this.initOthersData();
   }
 
+  ngOnInit(): void {
+
+  }
+
   private initMiniAreaData() {
     // 客户预存款总额
     this.service.request(this.service.$api_total_advance_deposit).subscribe((res: DataTotalVO) => {
@@ -80,7 +83,7 @@ export class DatatableDataindexComponent implements OnInit {
         const billTypeDatas2 = this.formatCoordinateData(res);
         console.log(billTypeDatas2);
 
-        this.initBillChart(this.g2custom['el'].nativeElement as any,billTypeDatas2);
+        this.initBillChart(this.g2custom['el'].nativeElement as any, billTypeDatas2);
       }
     });
     // 大区业绩完成情况
@@ -101,7 +104,6 @@ export class DatatableDataindexComponent implements OnInit {
       if (res) {
         const billTypeDatas = this.formatCoordinateData(res.map((item: any) => ({ ...item, billType: item.wayBillType })));
         console.log(billTypeDatas);
-        
         this.initBillChart(this.BillDirectProportion['el'].nativeElement as any, billTypeDatas);
       }
     });
@@ -145,7 +147,7 @@ export class DatatableDataindexComponent implements OnInit {
 
     chart.scale('percent', {
       formatter: val => {
-        val = (val * 100 ).toFixed(0)+ '%';
+        val = (val * 100).toFixed(0) + '%';
         return val;
       }
     });
@@ -202,7 +204,7 @@ export class DatatableDataindexComponent implements OnInit {
       .label('percent', percent => {
         return {
           content: data => {
-            return (percent * 100).toFixed(0)+`%`;
+            return (percent * 100).toFixed(0) + `%`;
           },
           style: { fontSize: 14 }
         };
@@ -351,6 +353,8 @@ export class DatatableDataindexComponent implements OnInit {
         }
         return {};
       });
+    console.log(chart);
+
     chart.render();
   }
 

src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-07 15:42:10
+ * @LastEditTime : 2022-05-11 17:04:39
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -23,7 +23,14 @@
     <sv-title> 固定结算费率配置</sv-title>
 
     <sv label="固定结算费率">
-      <nz-input-number [disabled]="hiden" [nzMin]="0" [nzMax]="100" [(ngModel)]="accountingRate" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number
+      <nz-input-number
+        [disabled]="hiden"
+        [nzMin]="0"
+        [nzMax]="100"
+        [(ngModel)]="accountingRate"
+        [nzPrecision]="precision"
+        nzPlaceHolder="请输入"
+      ></nz-input-number
       >&nbsp;%</sv
     >
 
@@ -74,15 +81,26 @@
     </sv>
 
     <sv label="优先级" col="1">
-      <!-- <nz-select [(ngModel)]="priority" [disabled]="hiden" style="max-width: 400px; min-width: 200px; margin-left: 28px">
+      <nz-input-number
-        <nz-option nzValue="1" nzLabel="1">1</nz-option>
+        style="max-width: 400px; min-width: 200px; margin-left: 28px"
-        <nz-option nzValue="2" nzLabel="2">2</nz-option>
+        [(ngModel)]="priority"
-        <nz-option nzValue="3" nzLabel="3">3</nz-option>
+        [nzMin]="0"
-        <nz-option nzValue="4" nzLabel="4">4</nz-option>
+        [nzMax]="9999"
-        <nz-option nzValue="5" nzLabel="5">5</nz-option>
+        [nzStep]="1"
-      </nz-select> -->
+      ></nz-input-number>
-      <nz-input-number style="max-width: 400px; min-width: 200px; margin-left: 28px" [(ngModel)]="priority" [nzMin]="0" [nzMax]="9999" [nzStep]="1"></nz-input-number>
+      <div style="color: #7F7F7F;margin-left: 28px">
+        1、指全部合伙人、新注册合伙人、自定义合伙人三种范围优先执行的顺序，等级数字越大，优先执行该返佣模板<br />
+        2、同一合伙人范围的按创建时间最新的执行返佣模板
+      </div>
     </sv>
+    <!-- <sv label="生效时间" col="1">
+      <nz-date-picker
+      nzShowTime
+      nzFormat="yyyy-MM-dd HH:mm:ss"
+      [(ngModel)]="enableTime"
+      nzPlaceHolder="请选择，精确到秒"
+    ></nz-date-picker>
+    </sv> -->
 
     <sv label="规则说明" col="1">
       <sf
@@ -99,7 +117,9 @@
 
     <sv label="备注" col="1" style="margin-top: 16px">
       <textarea
-        [disabled]="hiden"
+      maxlength="20"
+      placeholder="请输入20个字符"
+      [readonly]='hiden'
         style="max-width: 400px; min-width: 200px; margin-left: 40px"
         rows="4"
         nz-input

src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-21 09:26:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-07 15:38:49
+ * @LastEditTime : 2022-05-11 16:49:20
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -12,6 +12,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFSchema } from '@delon/form';
+import { DatePipe } from '@delon/theme';
 import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../../services/rebate-management.service';
@@ -19,7 +20,8 @@ import { ParterRebateManageMentAddPartnerListComponent } from '../add-partnerlis
 @Component({
   selector: 'app-parter-channel-rebate-management-add',
   styleUrls: ['./add.component.less'],
-  templateUrl: './add.component.html'
+  templateUrl: './add.component.html',
+  providers: [DatePipe]
 })
 export class ParterRebateManageMentAddComponent implements OnInit {
   @ViewChild('table') table!: any;
@@ -27,6 +29,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
   tabelData: any;
   tabelType: any;
   formData: any;
+  enableTime: any;
   addStatus: boolean = false;
   hiden: boolean = false;
   configName: string = '';
@@ -48,7 +51,8 @@ export class ParterRebateManageMentAddComponent implements OnInit {
     public ar: ActivatedRoute,
     public service: RebateManagementService,
     private modal: NzModalService,
-    public shipperservice: ShipperBaseService
+    public shipperservice: ShipperBaseService,
+    private datePipe: DatePipe
   ) {}
   columns: STColumn[] = [];
   initSF(data?: any) {
@@ -200,6 +204,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
       accountingRate: this.accountingRate,
       configName: this.configName,
       configType: this.configType,
+      // enableTime:this.datePipe.transform(this.enableTime,'yyyy-MM-dd HH:mm:ss'),
       rebateConfigLineDTO: this.table.data,
       priority: this.priority, // 优先级
       partnerIds: this.partnerId,
@@ -229,6 +234,8 @@ export class ParterRebateManageMentAddComponent implements OnInit {
         this.priority = res?.priority + '';
         this.formData = { ruleDescription: res?.ruleDescription };
         this.remark = res.remark;
+        // this.enableTime = res.enableTime;
+        // this.enableTime = new Date(Date.parse(res?.enableTime?.replace(/-/g, '/')))
       }
     });
   }

src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-06 16:37:06
+ * @LastEditTime : 2022-05-11 17:07:17
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -58,7 +58,7 @@
     <div *ngIf="item.partnerType == 3">自定义合伙人</div>
   </ng-template>
   <ng-template st-row='stateLocked' let-item let-index='index'>
-    <div >{{item?.stateLocked ? '生效中' : '失效'}}</div>
+    <div >{{item?.stateLocked ? '失效' : '生效中'}}</div>
   </ng-template>
   </st>
 </nz-card>

src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts

@@ -53,8 +53,8 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
           title: '状态',
           enum: [
             { label: '全部', value: '' },
-            { label: '生效中', value: 1 },
+            { label: '生效中', value: 0 },
-            { label: '失效', value: 0 }
+            { label: '失效', value: 1 }
           ],
           ui: {
             widget: 'select'
@@ -127,7 +127,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
             text: '禁用',
             acl: { ability: ['REBATE-SETTING-forbidden'] },
             iif: _record => {
-              return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2);
+              return _record.stateLocked == false && (_record.partnerType == 3 || _record.partnerType == 2);
             },
             click: _record => this.viewEvaluate(_record)
           },
@@ -135,7 +135,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
             text: '启用',
             acl: { ability: ['REBATE-SETTING-startUseing'] },
             iif: _record => {
-              return _record.stateLocked == false;
+              return _record.stateLocked == true;
             },
             click: _record => this.viewEvaluate(_record)
           }

src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts

@@ -292,9 +292,9 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
     if (this.selectedRows.length === 0) {
       params ={}
     } else{
-      params ={ ids: []}
+      params =[]
       this.selectedRows.forEach(item => {
-        params.ids.push(item.id);
+        params.push(item.billId);
       });
     }