Merge branch 'develop'

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-07 17:54:06
+ * @LastEditTime : 2022-05-09 11:25:41
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts

@@ -127,7 +127,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
     this.initST();
     setTimeout(() => {
       this.st.load();
-      this.getGoodsSourceStatistical();
     }, 500);
   }
   ngOnInit(): void {

src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts

@@ -48,7 +48,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
 
   afterRes = (data: any[], rawData?: any) => {
     data = data.map(node => ({ ...node, 
-      // disabled: node.refundStatus !== '1'
+      disabled: node.refundStatus !== '1'
      }));
     return data;
   };

src/app/routes/partner/partner-list/components/index/partner-list.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-29 17:28:23
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-06 14:20:04
+ * @LastEditTime : 2022-05-09 11:33:34
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -13,11 +13,15 @@
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 17" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+      <sf
-        [compact]="true" [button]="'none'"></sf>
+        #sf
+        [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+        [compact]="true"
+        [button]="'none'"
+      ></sf>
     </div>
-    <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+    <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right" [class.expend-options]="_$expand">
-      [class.expend-options]="_$expand">
       <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -30,20 +34,40 @@
 
 <nz-card class="content-box" nzBordered>
   <div class="d-flex align-items-center mb-md mt-md">
-    <button nz-button (click)="this.routeTo('/partner/partner-list/add-etp-partner')" nzType="primary"  acl  [acl-ability]="['ENTERPRISE-saveEnterprise']">新增企业合伙人</button>
+    <button
-    <button nz-button (click)="this.routeTo('/partner/partner-list/add-personal-partner')"
+      nz-button
-      nzType="primary"  acl  [acl-ability]="['ENTERPRISE-savePersonally']">新增个人合伙人</button>
+      (click)="this.routeTo('/partner/partner-list/add-etp-partner')"
+      nzType="primary"
+      acl
+      [acl-ability]="['ENTERPRISE-saveEnterprise']"
+      >新增企业合伙人</button
+    >
+    <button
+      nz-button
+      (click)="this.routeTo('/partner/partner-list/add-personal-partner')"
+      nzType="primary"
+      acl
+      [acl-ability]="['ENTERPRISE-savePersonally']"
+      >新增个人合伙人</button
+    >
   </div>
 
-  <st #st [data]="service.$api_get_partner_page" [columns]="columns" [req]="{ process: beforeReq }"
+  <st
-    [loading]="service.http.loading" [scroll]="{ x: '1200px' }" [page]="{}">
+    #st
+    [data]="service.$api_get_partner_page"
+    [columns]="columns"
+    [req]="{ process: beforeReq }"
+    [loading]="service.http.loading"
+    [scroll]="{ x: '1200px' }"
+    [page]="{}"
+  >
   </st>
 </nz-card>
 
 <ng-template #editTemplate>
   <div nz-row nzGutter="8">
     <div nz-col nzSpan="24" se-container [labelWidth]="120">
-      <se [col]="1" label="合伙人名称"> {{selectItem?.enterpriseName || selectItem?.contactName}} </se>
+      <se [col]="1" label="合伙人名称"> {{ selectItem?.enterpriseName || selectItem?.contactName }} </se>
       <se [col]="1" label="返佣模板" required>
         <nz-select [(ngModel)]="templateId" style="width: 100%">
           <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of customers"></nz-option>
@@ -57,8 +81,8 @@
 <ng-template #editCannel>
   <div nz-row nzGutter="8">
     <div nz-col nzSpan="24" se-container [labelWidth]="140" [col]="1">
-      <se label="合伙人名称"> {{selectItem?.enterpriseName || selectItem?.contactName}} </se>
+      <se label="合伙人名称"> {{ selectItem?.enterpriseName || selectItem?.contactName }} </se>
-      <se label="当前渠道销售"> {{selectItem?.channelIdLabel}} </se>
+      <se label="当前渠道销售"> {{ selectItem?.channelIdLabel }} </se>
       <se label="渠道销售修改为" required>
         <nz-select [(ngModel)]="cannelItem.channelId" style="width: 100%">
           <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of cannels"></nz-option>
@@ -68,21 +92,32 @@
         <textarea rows="3" nz-input [(ngModel)]="cannelItem.remark"></textarea>
       </se>
       <se label="一并转移的客户">
-        <p style="margin-top: 8px">已选（{{selectedRows?.length}}）</p>
+        <p style="margin-top: 8px">已选（{{ selectedRows?.length }}）</p>
-        <st #rest [data]="service.$api_get_enterprice_rel_list" [columns]="[
+        <st
-        { title: '', index: 'key', type: 'checkbox' },
+          #rest
-        { title: '客户名称', index: 'enterpriceName' }
+          [data]="service.$api_get_enterprice_rel_list"
-        ]" [req]="{ process: beforeReq,params:{effectiveStatus:2 ,newPartnerId:selectItem.id} }"
+          [columns]="[
-          [loading]="service.http.loading" [page]="{show:false}" (change)="stChange($event)">
+            { title: '', index: 'key', type: 'checkbox' },
+            { title: '客户名称', index: 'enterpriseName' }
+          ]"
+          [res]="{ reName: { list: 'data', total: 'data.total' } }"
+          [req]="{ process: beforeReq, params: { effectiveStatus: 2, newPartnerId: selectItem.id } }"
+          [loading]="service.http.loading"
+          [page]="{ show: false }"
+          
+          (change)="stChange($event)"
+        >
         </st>
       </se>
       <se label="生效节点" required>
         <nz-radio-group [(ngModel)]="cannelItem.effectiveNode">
           <label nz-radio [nzValue]="1">修改成功后立即生效</label>
-          <label nz-radio [nzValue]="2">CRM流程审核通过后生</label>
+          <!-- <label nz-radio [nzValue]="2">CRM流程审核通过后生效</label> -->
         </nz-radio-group>
       </se>
     </div>
   </div>
-  <p class="text-center mt-md">客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p>
+  <p class="text-center mt-md"
-</ng-template>
+    >客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p
+  >
+</ng-template>

src/app/routes/partner/partner-list/components/index/partner-list.component.ts

@@ -162,7 +162,7 @@ export class PartnerListComponent {
     const modal = this.nzModalService.confirm({
       nzTitle: '确定提交吗？',
       nzOnOk: () => {
-        this.cannelItem.enterpriseIdList = this.selectedRows.map(row => row.id);
+        this.cannelItem.enterpriseIdList = this.selectedRows.map(row => row.enterpriseId);
         this.service
           .request(this.service.$api_update_partner_channel_by_id, {
             ...this.cannelItem,

src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts

@@ -10,7 +10,6 @@ import {
   SFTextareaWidgetSchema,
   SFUISchema
 } from '@delon/form';
-import { _HttpClient } from '@delon/theme';
 import { AmapPoiPickerComponent, AmapService, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-famifiar.component';
@@ -20,7 +19,6 @@ import { of } from 'rxjs';
 import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component';
 import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component';
 import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component';
-import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
 import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component';
 @Component({
   selector: 'app-publish-goods-bulk-publish',
@@ -58,7 +56,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
   };
   patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`;
   constructor(
-    private http: _HttpClient,
     fb: FormBuilder,
     private router: Router,
     private route: ActivatedRoute,

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -3,9 +3,8 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
 import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
 import format from 'date-fns/format';
 import { Subject } from 'rxjs';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import {
-  SFCheckboxWidgetSchema,
   SFComponent,
   SFNumberWidgetSchema,
   SFSchema,
@@ -14,7 +13,6 @@ import {
   SFTextareaWidgetSchema,
   SFUISchema
 } from '@delon/form';
-import { _HttpClient } from '@delon/theme';
 import { AmapPoiPickerComponent, AmapService, EACacheService, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { of } from 'rxjs';
@@ -67,9 +65,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
   envCache: any;
   enterpriseProjectIds: any;
   constructor(
-    private http: _HttpClient,
     fb: FormBuilder,
-    private router: Router,
     private route: ActivatedRoute,
     private modalService: NzModalService,
     public service: SupplyManagementService,

src/app/routes/supply-management/components/release-publish/release-publish.component.ts

@@ -1,10 +1,8 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
 import { cacheConf } from '@conf/cache.conf';
 import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
 import {
-  SFCheckboxWidgetSchema,
   SFComponent,
   SFNumberWidgetSchema,
   SFSchema,
@@ -13,7 +11,6 @@ import {
   SFTextareaWidgetSchema,
   SFUISchema
 } from '@delon/form';
-import { SettingsService, _HttpClient } from '@delon/theme';
 import { EACacheService, ShipperBaseService } from '@shared';
 import format from 'date-fns/format';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -54,13 +51,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
   shipperName = '';
   patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`;
   constructor(
-    private http: _HttpClient,
     fb: FormBuilder,
     private modalService: NzModalService,
-    private settingSrv: SettingsService,
     public service: SupplyManagementService,
-    private router: Router,
-    private route: ActivatedRoute,
     private eaCacheSrv: EACacheService,
     private amapService: AmapService,
     public shipperSrv: ShipperBaseService

src/app/routes/supply-management/components/vehicle/vehicle.component.ts

@@ -2,12 +2,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { Component, OnInit, ViewChild, OnChanges } from '@angular/core';
 import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { map } from 'rxjs/operators';
 import { SupplyManagementService } from '../../services/supply-management.service';
 import { SupplyManagementVehicleAssignedCarComponent } from '../assigned-car/assigned-car.component';
-import { SupplyManagementUpdateExternalSnComponent } from '../update-external-sn/update-external-sn.component';
 import { of } from 'rxjs';
 import { SearchDrawerService, ShipperBaseService } from '@shared';
 import { SupplyManagementImportSupplyComponent } from '../../model/import-supply/import-supply.component';
@@ -44,7 +42,6 @@ export class SupplyManagementVehicleComponent extends BasicTableComponent implem
     public service: SupplyManagementService,
     private modal: NzModalService,
     private router: Router,
-    private ar: ActivatedRoute,
     public shipperSrv: ShipperBaseService,
     public searchDrawerService: SearchDrawerService
   ) {

src/app/routes/sys-setting/components/note-management/note-management.component.ts

@@ -9,10 +9,8 @@
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema } from '@delon/form';
-import { NzModalService } from 'ng-zorro-antd/modal';
 import { SystemService } from '../../services/system.service';
 
 @Component({
@@ -20,7 +18,7 @@ import { SystemService } from '../../services/system.service';
   templateUrl: './note-management.component.html',
   styleUrls: ['../../../commom/less/box.less']
 })
-export class NoTeManagementComponent implements OnInit {
+export class NoTeManagementComponent {
   @ViewChild('st', { static: true })
   st!: STComponent;
   @ViewChild('sf', { static: false })
@@ -52,11 +50,9 @@ export class NoTeManagementComponent implements OnInit {
   },
   ];
 
-  constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) {
+  constructor(public service: SystemService) {
   }
 
-  ngOnInit(): void {}
-
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, { ...this.sf?.value });

src/app/routes/ticket-management/components/billing-order/billing-order.component.ts

@@ -1,9 +1,8 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form';
 import { SearchDrawerService } from '@shared';
-import { NzModalService } from 'ng-zorro-antd/modal';
 import { BasicTableComponent } from 'src/app/routes/commom';
 import { TicketService } from '../../services/ticket.service';
 
@@ -214,7 +213,11 @@ export class BillingOrderComponent extends BasicTableComponent {
         className: 'text-center',
         index: 'paymentMethodRate',
         width: 130,
-        format: record => `${record.paymentMethodRate*100}%`
+<<<<<<< HEAD
+        format: record => `${(record.paymentMethodRate*100).toFixed(2)}%`
+=======
+        format: record => `${record.paymentMethodRate * 100}%`
+>>>>>>> b6b51c9a662efd271b713242c077a04c199ed167
       },
       { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
       { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' },

src/app/routes/usercenter/components/driver/captain/captain.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
-import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
+import { STColumn, STComponent, STData } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { SFSchema } from '@delon/form';
 import { ModalHelper } from '@delon/theme';
 import { DynamicSettingModalComponent, SearchDrawerService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -26,7 +26,6 @@ export class UserCenterComponentsDriverCaptainComponent extends BasicTableCompon
     public service: UsermanageService,
     private modal: NzModalService,
     private router: Router,
-    private ar: ActivatedRoute,
     private modalHelper: ModalHelper,
     public searchDrawerService: SearchDrawerService
   ) {
@@ -57,8 +56,7 @@ export class UserCenterComponentsDriverCaptainComponent extends BasicTableCompon
     return this.st?.list.filter(item => item.checked) || [];
   }
 
-  ngOnInit() {
+  ngOnInit() {}
-  }
   dataProcess(data: STData[]): STData[] {
     return data.map((i, index) => {
       i.showSortFlag = false;

src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts

@@ -1,5 +1,4 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFSchema } from '@delon/form';
 import { DynamicSettingModalComponent, SearchDrawerService } from '@shared';

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {  Router } from '@angular/router';
 import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { SearchDrawerService } from '@shared';

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts

@@ -1,5 +1,4 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
 import { STColumn, STComponent, STRequestOptions, STData, STChange } from '@delon/abc/st';
 import { SFUISchema, SFSchema, SFComponent, SFDateWidgetSchema } from '@delon/form';
 import { ShipperBaseService, DynamicSettingModalComponent, SearchDrawerService } from '@shared';

src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts

@@ -1,14 +1,7 @@
-import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
-import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ShipperBaseService } from '@shared';
-import { _HttpClient } from '@delon/theme';
-import { EAEnvironmentService, ShipperBaseService } from '@shared';
-import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
-import format from 'date-fns/format';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzUploadFile } from 'ng-zorro-antd/upload';
-import { Observable, Observer, of } from 'rxjs';
-import { apiConf } from '@conf/api.conf';
 import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 
@@ -23,39 +16,33 @@ export class EditPartnerComponentsAddComponent implements OnInit {
   sts: any;
   rows: any;
   schema: SFSchema = {};
-  detailData: any = {}
+  detailData: any = {};
   ui: SFUISchema = {};
- 
+
   constructor(
     public msgSrv: NzMessageService,
-    public http: _HttpClient,
-    private route: ActivatedRoute,
-    private router: Router,
     public service: UsermanageService,
-    private envSrv: EAEnvironmentService,
     private modal: NzModalRef,
     public shipperservice: ShipperBaseService
-  ) { }
+  ) {}
-
 
   ngOnInit(): void {
-    if(this.sts == '2') {
+    if (this.sts == '2') {
-       this.initDetailData()
+      this.initDetailData();
     }
     this.initSF();
   }
   initDetailData() {
-  
     const params = {
       id: this.i.id
-    }
+    };
     this.service.request(this.service.$api_partnerChannelUpdateDetaiList, params).subscribe(res => {
-      if(res) {
+      if (res) {
-        this.detailData = res
+        this.detailData = res;
       } else {
-        this.service.msgSrv.error(res.msg)
+        this.service.msgSrv.error(res.msg);
       }
-    })
+    });
   }
   initSF() {
     this.schema = {
@@ -98,7 +85,7 @@ export class EditPartnerComponentsAddComponent implements OnInit {
         settStartTime: {
           title: '结算起算日期',
           type: 'string',
-          format: 'date',
+          format: 'date'
         },
         remark: {
           type: 'string',
@@ -107,30 +94,29 @@ export class EditPartnerComponentsAddComponent implements OnInit {
             widget: 'textarea',
             placeholder: '请不要超过50个字',
             maxLength: 50,
-            autosize: { minRows: 2, maxRows: 6 },
+            autosize: { minRows: 2, maxRows: 6 }
-          },
+          }
         },
         effectiveNode: {
           type: 'string',
           title: '生效节点',
           ui: {
             widget: 'radio',
-            showRequired: true,
+            showRequired: true
           } as SFRadioWidgetSchema,
           enum: [
             { label: '修改成功后立即生效', value: 1 },
-            { label: 'CRM流程审核后生效', value: 2 },
+            // { label: 'CRM流程审核通过后生效', value: 2 },
-            { label: 'CRM流程审核通过后生效', value: 3 }
           ],
         },
       },
-      required: ['channelId', 'remark', 'effectiveNode'],
+      required: ['channelId', 'remark', 'effectiveNode']
     };
     this.ui = {
       '*': {
         spanLabelFixed: 180,
         grid: { span: 18 },
-        width: 600,
+        width: 600
       }
     };
   }
@@ -138,27 +124,27 @@ export class EditPartnerComponentsAddComponent implements OnInit {
     return {};
   }
   close(): void {
-    this.modal.close(true)
+    this.modal.close(true);
   }
   save() {
     console.log(this?.rows);
-    let enterId : any;
+    let enterId: any;
-    if(this.sts == '1') {
+    if (this.sts == '1') {
-      enterId = this.rows 
+      enterId = this.rows;
     } else {
-      enterId = [this.i.id]
+      enterId = [this.i.id];
     }
     const params = {
       ...this.sf?.value,
       enterpriceIds: enterId,
       settStartTime: this.sf?.value?.settStartTime + ' 00:00:00'
-    }
+    };
 
     this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => {
-      if(res) {
+      if (res) {
         this.service.msgSrv.success('修改成功');
-        this.modal.destroy(true)
+        this.modal.destroy(true);
       }
-    })
+    });
   }
 }

src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts

@@ -1,14 +1,7 @@
-import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
-import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ShipperBaseService } from '@shared';
-import { _HttpClient } from '@delon/theme';
-import { EAEnvironmentService, ShipperBaseService } from '@shared';
-import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
-import format from 'date-fns/format';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzUploadFile } from 'ng-zorro-antd/upload';
-import { Observable, Observer, of } from 'rxjs';
-import { apiConf } from '@conf/api.conf';
 import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 
@@ -24,39 +17,33 @@ export class EditSaleComponentsAddComponent implements OnInit {
   sts: any;
   rows: any;
   schema: SFSchema = {};
-  detailData: any = {}
+  detailData: any = {};
   ui: SFUISchema = {};
 
   constructor(
     public msgSrv: NzMessageService,
-    public http: _HttpClient,
-    private route: ActivatedRoute,
-    private router: Router,
     public service: UsermanageService,
-    private envSrv: EAEnvironmentService,
     private modal: NzModalRef,
     public shipperservice: ShipperBaseService
-    
+  ) {}
-  ) { }
-
 
   ngOnInit(): void {
-    if(this.sts == '2') {
+    if (this.sts == '2') {
-      this.initDetailData()
+      this.initDetailData();
-   }
+    }
     this.initSF();
   }
   initDetailData() {
     const params = {
       id: this.i.id
-    }
+    };
     this.service.request(this.service.$api_partnerChannelUpdateDetaiList, params).subscribe(res => {
-      if(res) {
+      if (res) {
-        this.detailData = res
+        this.detailData = res;
       } else {
-        this.service.msgSrv.error(res.msg)
+        this.service.msgSrv.error(res.msg);
       }
-    })
+    });
   }
   initSF() {
     this.schema = {
@@ -81,30 +68,29 @@ export class EditSaleComponentsAddComponent implements OnInit {
             widget: 'textarea',
             placeholder: '请不要超过50个字',
             maxLength: 50,
-            autosize: { minRows: 2, maxRows: 6 },
+            autosize: { minRows: 2, maxRows: 6 }
-          },
+          }
         },
         effectiveNode: {
           type: 'string',
           title: '生效节点',
           ui: {
             widget: 'radio',
-            showRequired: true,
+            showRequired: true
           } as SFRadioWidgetSchema,
           enum: [
             { label: '修改成功后立即生效', value: 1 },
-            { label: 'CRM流程审核后生效', value: 2 },
+            // { label: 'CRM流程审核通过后生效', value: 2 },
-            { label: 'CRM流程审核通过后生效', value: 3 }
           ],
         },
       },
-      required: ['channelId', 'remark', 'effectiveNode'],
+      required: ['channelId', 'remark', 'effectiveNode']
     };
     this.ui = {
       '*': {
         spanLabelFixed: 180,
         grid: { span: 18 },
-        width: 600,
+        width: 600
       }
     };
   }
@@ -112,31 +98,30 @@ export class EditSaleComponentsAddComponent implements OnInit {
     return {};
   }
   save() {
-    let enterId : any;
+    let enterId: any;
-    if(this.sts == '1') {
+    if (this.sts == '1') {
-      enterId = this.rows 
+      enterId = this.rows;
     } else {
-      enterId = [this.i.id]
+      enterId = [this.i.id];
     }
     this.service.nzModalService.create({
       nzContent: '确定提交吗？',
       nzOnOk: () => {
         const params = {
           ...this.sf?.value,
-           enterpriceIds: enterId,
+          enterpriceIds: enterId
-
+        };
-        }
         this.service.request(this.service.$api_batchUpdateEnterpriceChannel, params).subscribe(res => {
-          if(res) {
+          if (res) {
-            this.service.msgSrv.success('修改成功')
+            this.service.msgSrv.success('修改成功');
-            this.modal.destroy(true)
+            this.modal.destroy(true);
           }
-        })
+        });
       }
     });
   }
 
   close(): void {
-    this.modal.close(true)
+    this.modal.close(true);
   }
 }

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

@@ -46,12 +46,12 @@
           <li nz-menu-item (click)="creat()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">
             新增企业
           </li>
-          <!-- <li nz-menu-item (click)="editPartner()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-partner']">
+          <li nz-menu-item (click)="editPartner()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-partner']">
             修改合伙人
           </li>
           <li nz-menu-item (click)="editSale()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-sale']">
             修改渠道销售
-          </li> -->
+          </li>
         </ul>
       </nz-dropdown-menu>
     </div>

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -469,14 +469,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
             text: '分配客服<br>',
             click: item => this.showService(item)
           },
-          // {
+          {
-          //   text: '修改合伙人',
+            text: '修改合伙人',
-          //   click: item => this.editPartner(item)
+            click: item => this.editPartner(item)
-          // },
+          },
-          // {
+          {
-          //   text: '修改渠道销售',
+            text: '修改渠道销售',
-          //   click: item => this.editSale(item)
+            click: item => this.editSale(item)
-          // }
+          }
         ]
       }
     ];

src/app/routes/usercenter/components/freight/list/new/new.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
 import {
   SFCascaderWidgetSchema,

src/app/routes/usercenter/components/freight/list/view/view.component.ts

@@ -1,8 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { STColumn, STComponent } from '@delon/abc/st';
+import { STComponent } from '@delon/abc/st';
-import { ModalHelper, _HttpClient } from '@delon/theme';
-import { NzMessageService } from 'ng-zorro-antd/message';
 import { UsermanageService } from '../../../../services/usercenter.service';
 import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form';
 import { Observable, Observer } from 'rxjs';
@@ -31,16 +29,11 @@ export class FreightComponentsListViewComponent implements OnInit {
   FreightsData: any = {};
 
   constructor(
-    private http: _HttpClient,
-    private modal: ModalHelper,
     public service: UsermanageService,
     private route: ActivatedRoute,
-    private modalHelper: ModalHelper,
-    private msgSrv: NzMessageService,
   ) {}
 
   ngOnInit() {
-    console.log(this.route.snapshot);
     this.initData();
     this.initSF();
     // this.launchSign();

src/app/routes/vehicle/components/list/detail/detail.component.ts

@@ -2,14 +2,12 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
+import { ModalHelper } from '@delon/theme';
-import { NzMessageService } from 'ng-zorro-antd/message';
 import { VehicleService } from '../../../services/vehicle.service';
 import { VehicleComponentsListEditComponent } from '../edit/edit.component';
 import { VehicleImgViewComponent } from '../img-view/img-view.component';
 import { apiConf } from '@conf/api.conf';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { ImageViewComponent } from 'src/app/shared/components/imagelist';
 import { EADateUtil } from '@shared';
 import { NzImageService } from 'ng-zorro-antd/image';
 
@@ -44,12 +42,9 @@ export class VehicleComponentsListDetailComponent implements OnInit {
   contenCarEnergy: any;
 
   constructor(
-    private http: _HttpClient,
     private modal: ModalHelper,
     public service: VehicleService,
     private route: ActivatedRoute,
-    private modalHelper: ModalHelper,
-    private msgSrv: NzMessageService,
     private nzModalService: NzModalService,
     private nzImageService: NzImageService
   ) {}

src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts

@@ -9,9 +9,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { STColumn } from '@delon/abc/st';
-import { _HttpClient } from '@delon/theme';
-import { NzCardComponent } from 'ng-zorro-antd/card';
-import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import format from 'date-fns/format';
 import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
@@ -63,7 +60,6 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
   ];
   constructor(
     private route: ActivatedRoute,
-    private msgSrv: NzMessageService,
     private modal: NzModalService,
     private service: WaybillManagementServe,
     private modalService: NzModalService

src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts

@@ -9,10 +9,7 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { STColumn } from '@delon/abc/st';
-import { _HttpClient } from '@delon/theme';
 import format from 'date-fns/format';
-import { NzCardComponent } from 'ng-zorro-antd/card';
-import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { Subscription, fromEvent } from 'rxjs';
 import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
@@ -59,7 +56,6 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
   subscribeScoll!: Subscription;
   constructor(
     private route: ActivatedRoute,
-    private msgSrv: NzMessageService,
     private service: WaybillManagementServe,
     private modal: NzModalService
   ) {}

src/app/shared/services/business/user.service.ts

@@ -7,9 +7,8 @@
  * @Reference:
  */
 import { Inject, Injectable, Injector } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { cacheConf } from '@conf/cache.conf';
-import { eventConf } from '@conf/event.conf';
 import { sysConf } from '@conf/sys.conf';
 import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
 import { MenuService, SettingsService } from '@delon/theme';
@@ -78,7 +77,6 @@ export class EAUserService extends BaseService {
     public settings: SettingsService,
     private menuService: MenuService,
     public router: Router,
-    public ar: ActivatedRoute,
     @Inject(DA_SERVICE_TOKEN) public tokenSrv: ITokenService,
     private settingSrv: SettingsService
   ) {