解决冲突

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-07 14:49:15
+ * @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/account/components/edit-password/edit-password.component.ts

@@ -9,14 +9,11 @@
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 
-import { Component, Inject, OnInit, ViewChild } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
-import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
 import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
 
-import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { NzDrawerRef, NzDrawerService } from 'ng-zorro-antd/drawer';
 import { NzFormTooltipIcon } from 'ng-zorro-antd/form';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { AccountService } from '../../services/account.service';
@@ -30,14 +27,13 @@ export class AccountComponentsCenterEditComponent implements OnInit {
   record: any;
   count = 0;
   type = 'create';
-  isVisibleView = false
+  isVisibleView = false;
   passwordVisible = false;
   passwordVisible2 = false;
   password: any;
   password2: any;
   interval$: any;
-  confirmationValidator =
+  confirmationValidator = (control: FormControl): { [s: string]: boolean } => {
- (control: FormControl): { [s: string]: boolean } => {
     if (!control.value) {
       return { required: true };
     } else if (control?.value !== this.validateForm?.value?.passWord) {
@@ -51,7 +47,6 @@ export class AccountComponentsCenterEditComponent implements OnInit {
   };
   constructor(
     public router: Router,
-    public ar: ActivatedRoute,
     private modalRef: NzModalRef,
     private fb: FormBuilder,
     public service: AccountService,
@@ -61,19 +56,21 @@ export class AccountComponentsCenterEditComponent implements OnInit {
   ngOnInit() {
     this.initForm();
   }
-  initForm () {
+  initForm() {
     this.validateForm = this.fb.group({
-    passWord: [null,
+      passWord: [
+        null,
         [
           Validators.required,
           Validators.maxLength(16),
           Validators.minLength(8),
           Validators.pattern('^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z-_]{8,16}$')
-      ]],
+        ]
-    passWordTo: [null, [ Validators.required, Validators.maxLength(16), Validators.minLength(8), this.confirmationValidator,]],
+      ],
-    smsVerifyCode: [null, [Validators.required]],
+      passWordTo: [null, [Validators.required, Validators.maxLength(16), Validators.minLength(8), this.confirmationValidator]],
+      smsVerifyCode: [null, [Validators.required]]
     });
-}
+  }
   destroyModal(): void {
     this.modalRef.destroy();
   }
@@ -84,28 +81,28 @@ export class AccountComponentsCenterEditComponent implements OnInit {
         this.service.msgSrv.success('发送成功');
         e.preventDefault();
         this.codeCountDown();
-      }else {
+      } else {
         this.service.msgSrv.success(res.msg);
       }
     });
   }
   save() {
-    if(!this.validateForm.valid) {
+    if (!this.validateForm.valid) {
-      this.service.msgSrv.warning('必填项为空或格式错误，请检查！')
+      this.service.msgSrv.warning('必填项为空或格式错误，请检查！');
       return;
     }
     const params = {
       ...this.validateForm.value
     };
-    this.service.request(this.service.$api_set_phoneUpdatePassword, params).subscribe((res) => {
+    this.service.request(this.service.$api_set_phoneUpdatePassword, params).subscribe(res => {
       if (res) {
         this.service.msgSrv.success('修改密码成功！');
         this.isVisibleView = true;
         setTimeout(() => {
           this.tokenService.clear();
-          this.router.navigate(['/passport/login'])
+          this.router.navigate(['/passport/login']);
-          this.modalRef.close()
+          this.modalRef.close();
-        }, 3000)
+        }, 3000);
       }
     });
   }
@@ -120,11 +117,11 @@ export class AccountComponentsCenterEditComponent implements OnInit {
     }, 1000);
   }
   handleCancel() {
-     this.isVisibleView = false
+    this.isVisibleView = false;
   }
   handleOK() {
-   this.modalRef.close()
+    this.modalRef.close();
     this.tokenService.clear();
-   this.router.navigate(['/passport/login'])
+    this.router.navigate(['/passport/login']);
   }
 }

src/app/routes/commom/less/commom-table.less

@@ -113,9 +113,10 @@
       line-height: 21px;
     }
 
-    // .text-truncate {
+    .text-truncate {
-    //   white-space: normal;
+      white-space: normal;
-    // }
+    }
+    
     // 强制头部居中
     .ant-table-container table>thead>tr>.options {
       text-align: center !important;

src/app/routes/contract-management/components/contract-frame/contract-frame.component.html

@@ -80,7 +80,8 @@
     (change)="stChange($event)"
   >
     <ng-template st-row="contractCode" let-item let-index="index">
-      <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
+      <a *ngIf="item.esignFlowStatus == '2'" (click)="service.openURL(item?.contractFilePath)">{{ item?.contractCode }}</a>
+      <a *ngIf="item.esignFlowStatus !== '2'" [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
     </ng-template>
   </st>
 </nz-card>

src/app/routes/contract-management/components/contract-list/contract-list.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-07 15:57:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-23 20:11:50
+ * @LastEditTime : 2022-05-07 17:52:57
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-list\\contract-list.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -51,8 +51,8 @@
   <st #st [data]="service.$api_listDetailed_page" [columns]="columns" [req]="{  params: reqParams }" [loading]="false"
     [scroll]="{ x: '1200px', y: '370px' }" (change)="stChange($event)">
     <ng-template st-row="contractCode" let-item let-index="index">
-      <a (click)="service.openURL(item?.contractFilePath)">{{ item?.contractCode }}</a>
+      <a *ngIf="item.esignFlowStatus == '2'" (click)="service.openURL(item?.contractFilePath)">{{ item?.contractCode }}</a>
-      <!-- <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a> -->
+      <a *ngIf="item.esignFlowStatus !== '2'" [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
     </ng-template>
     <ng-template st-row="signingObject" let-item let-index="index">
       <span *ngIf="item.signingObject == 0"></span>

src/app/routes/contract-management/components/contract-partner/contract-partner.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-07 13:29:57
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 10:08:28
+ * @LastEditTime : 2022-05-07 17:56:08
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-partner\\contract-partner.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -80,7 +80,8 @@
     (change)="stChange($event)"
   >
     <ng-template st-row="contractCode" let-item let-index="index">
-      <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
+      <a *ngIf="item.esignFlowStatus == '2'" (click)="service.openURL(item?.contractFilePath)">{{ item?.contractCode }}</a>
+      <a *ngIf="item.esignFlowStatus !== '2'" [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
     </ng-template>
   </st>
 </nz-card>

src/app/routes/download/components/list/list.component.ts

@@ -1,8 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData } from '@delon/abc/st';
-import { STChange, STColumn, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
-import { _HttpClient } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { DownloadService } from '../../services/download.service';
 
@@ -16,7 +14,7 @@ export class DownloadComponentsListComponent implements OnInit {
   columns: STColumn[] = [];
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
-  constructor(public service: DownloadService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+  constructor(public service: DownloadService, private modal: NzModalService) {}
 
   /**
    * 查询参数

src/app/routes/financial-management/components/cost-management/cost-management.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-30 19:36:30
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-23 16:35:15
+ * @LastEditTime : 2022-05-07 17:33:01
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -50,11 +50,11 @@
   </div> -->
   <st #st [data]="service.$api_get_cost_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
     [loading]="false" [scroll]="{ x: '2000px',y:scrollY }">
-    <ng-template st-row="armoeny" let-item let-index="index">
+    <!-- <ng-template st-row="armoeny" let-item let-index="index">
       {{ item.armoeny | currency }}
-    </ng-template>
+    </ng-template> -->
     <ng-template st-row="hrmoney" let-item let-index="index">
-      {{ item.hrmoney | currency }}
+      {{ item.armoeny ? (item.armoeny| currency ): '--' }} / {{ item.hrmoney? (item.hrmoney | currency) : '--'}}
     </ng-template>
     <ng-template st-row="artocode" let-item let-index="index"> {{ item.cnoCode }}/{{ item.cnoName }} </ng-template>
     <ng-template st-row="hrpaymoney" let-item let-index="index">

src/app/routes/financial-management/components/cost-management/cost-management.component.ts

@@ -252,8 +252,8 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn
       { title: '结算客户', render: 'artocode', width: 200, className: 'text-left' },
       { title: '应收对象', index: 'artoname', width: 200, className: 'text-left' },
       { title: '应付对象', index: 'hrtoname', width: 200, className: 'text-left' },
-      { title: '应收金额', render: 'armoeny', width: 150, className: 'text-right' },
+      { title: '应收/应付金额', render: 'hrmoney', width: 150, className: 'text-right' },
-      { title: '应付金额', render: 'hrmoney', width: 150, className: 'text-right' },
+      // { title: '应付金额', render: 'hrmoney', width: 150, className: 'text-right' },
       { title: '收/付款金额', render: 'hrpaymoney', width: 150, className: 'text-right' },
       { title: '开/收票金额', render: 'hrvatmoney', width: 150, className: 'text-right' },
       { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-center' },

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

@@ -213,7 +213,7 @@ export class PaymentOrderComponent extends BasicTableComponent implements OnInit
       { title: '收款人', index: 'hrToLabel', width: 150 },
       { title: '应付已核销', index: 'ishrhxLabel', width: 150 },
       { title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 },
-      { title: '创建时间', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
+      { title: '创建时间', index: 'createTime', type: 'date', className: 'text-center', width: 150 },
       { title: '创建人', index: 'createUserIdLabel', width: 160 },
       { title: '付款备注', index: 'payRemarks', width: 200 },
       {

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

@@ -48,6 +48,7 @@
     <div></div>
     <div class="mr-sm">
       <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+      <button nz-button nzDanger> 导出</button>
     </div>
   </div>
 

src/app/routes/financial-management/components/refund-record/refund-record.component.ts

@@ -174,6 +174,13 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit
             placeholder: '请输入'
           }
         },
+        captainName: {
+          type: 'string',
+          title: '收款人',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
         enterpriseProjectName: {
           type: 'string',
           title: '所属项目',

src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-28 20:27:07
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-05-07 16:22:32
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-summary\\voucher-summary.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <!-- <page-header-wrapper [title]="'凭证汇总'">
 </page-header-wrapper>
 
@@ -29,7 +39,8 @@
         <div class="mr-sm">
             <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
                 [acl-ability]="['FINANCIAL-VOUCHER-list']">筛选</button>
-            <button nz-button nzDanger (click)='exportList()'> 导出</button>
+            <button nz-button nzDanger acl
+            [acl-ability]="['FINANCIAL-VOUCHER-SUMMARY-export']" (click)='exportList()'> 导出</button>
         </div>
     </div>
     <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"

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

@@ -59,7 +59,9 @@ export class WithdrawalsRecordComponent extends BasicTableComponent {
   };
 
   afterRes = (data: any[], rawData?: any) => {
-    data = data.map(node => ({ ...node, disabled: node.refundStatus !== '1' }));
+    data = data.map(node => ({ ...node,
+       disabled: node.refundStatus !== '1' 
+      }));
     return data;
   };
 

src/app/routes/insurance-management/components/set/set.component.ts

@@ -8,15 +8,7 @@
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\set\\set.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
-import { Router } from '@angular/router';
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { STColumn } from '@delon/abc/st';
-import { _HttpClient } from '@delon/theme';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzModalService } from 'ng-zorro-antd/modal';
-import { InsuranceManagementService } from '../../services/insurance-management.service';
-import { NzCardComponent } from 'ng-zorro-antd/card';
 @Component({
   selector: 'app-insurance-management-set',
   templateUrl: './set.component.html',
@@ -24,11 +16,7 @@ import { NzCardComponent } from 'ng-zorro-antd/card';
 })
 export class insuranceManagementSetComponent implements OnInit {
  
-  constructor(
+  constructor() {
-    private route: ActivatedRoute,
-    private msgSrv: NzMessageService,
-    private service: InsuranceManagementService,
-  ) {
 
   }
 

src/app/routes/interface-docking/components/set/set.component.ts

@@ -9,32 +9,19 @@
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import {InterfaceDockingService} from '../../services/interface-docking.service';
 @Component({
   selector: 'app-interface-docking-set',
   templateUrl: './set.component.html',
   styleUrls: ['./set.component.less']
 })
 export class interfaceDockingSetComponent implements OnInit {
-
+  constructor() {}
-  constructor(
-    private route: ActivatedRoute,
-    private msgSrv: NzMessageService,
-    private service: InterfaceDockingService,
-  ) {
-
-  }
 
   ngOnInit(): void {
-    this.initData()
+    this.initData();
-  }
-  initData() {
-
   }
+  initData() {}
   goBack() {
     window.history.go(-1);
   }
-
 }

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

@@ -112,7 +112,6 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
     public shipperservice: ShipperBaseService,
     fb: FormBuilder,
     private envSrv: EAEnvironmentService,
-    private ar: ActivatedRoute
   ) {
     this.validateForm1 = fb.group({
       loadTime: [null, []],

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

@@ -88,7 +88,6 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    console.log(this.route?.snapshot?.queryParams?.sts);
     this.initData();
     this.getTrajectory();
   }

src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts

@@ -37,8 +37,6 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
     if (this.id)
     {
       this.getDetail(this.id);
-      console.log(this.ar.snapshot.queryParams.sts);
-      
       this.initSF();
       this.initSTAudit()
     } 

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

@@ -101,7 +101,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
     private modalService: NzModalService,
     private amapService: AmapService,
     public shipperservice: ShipperBaseService,
-    private ar: ActivatedRoute,
     fb: FormBuilder,
     private envSrv: EAEnvironmentService
   ) {
@@ -566,7 +565,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
     this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => {
       if (res) {
         this.service.msgSrv.success('修改成功！');
-        this.router.navigate(['/order-management/vehicle/vehicle-detail/', this.id], { relativeTo: this.ar });
+        this.router.navigate(['/order-management/vehicle/vehicle-detail/', this.id], { relativeTo: this.route });
       } else {
         this.service.msgSrv.error(res?.msg);
       }

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

@@ -72,7 +72,6 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
     private modal: NzModalService,
     public shipperservice: ShipperBaseService,
     public router: Router,
-    public ar: ActivatedRoute,
     public searchDrawerService: SearchDrawerService
   ) {
     super(searchDrawerService);

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

@@ -47,7 +47,9 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
   };
 
   afterRes = (data: any[], rawData?: any) => {
-    data = data.map(node => ({ ...node, disabled: node.refundStatus !== '1' }));
+    data = data.map(node => ({ ...node, 
+      disabled: node.refundStatus !== '1'
+     }));
     return data;
   };
 
@@ -74,16 +76,19 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
         const stList = this.st.list;
         stList.forEach(item => {
           if (!item.checked) {
+            
             const index = this.selectedRows.findIndex(_item => item.id === _item.id);
             if (index !== -1) this.selectedRows.splice(index, 1);
           }
         })
       }
       let totalCallNo = 0;
+      this.totalCallNo = 0;
       this.selectedRows.forEach((item => {
         totalCallNo = new Big(this.totalCallNo).plus(item?.amount).parse();
-      }));
       this.totalCallNo = totalCallNo;
+      }));
+      
     } else if (e.type === 'loaded') {
       // 页面加载时勾选
       (e?.loaded || []).forEach((r) => {

src/app/routes/partner/advice-feedback/components/list/list.component.ts

@@ -1,9 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { processSingleSort } from '@shared';
-import { NzModalService } from 'ng-zorro-antd/modal';
 import { AdviceFeedbackService } from '../../services/advice-feedback.service';
 
 @Component({
@@ -22,13 +20,8 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
   _$expand = false;
   selectedIndex = 0;
 
-  data=[{name1:1111}]
+  data = [{ name1: 1111 }];
-  constructor(
+  constructor(public router: Router, public service: AdviceFeedbackService) {}
-    public router: Router,
-    public ar: ActivatedRoute,
-    public service: AdviceFeedbackService,
-    private modalService: NzModalService
-  ) {}
 
   /**
    * 查询参数
@@ -89,7 +82,7 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
               _$expand: (value: boolean) => value
             }
           }
-        },
+        }
       }
     };
     this.ui = {
@@ -139,12 +132,12 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
         buttons: [
           {
             text: '详情',
-            click: (_record, _modal, _instance) => this.partnerView(_record),
+            click: (_record, _modal, _instance) => this.partnerView(_record)
           },
           {
             text: '处理',
-            click: (_record, _modal, _instance) => this.partnerView(_record),
+            click: (_record, _modal, _instance) => this.partnerView(_record)
-          },
+          }
         ]
       }
     ];
@@ -182,13 +175,12 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
         buttons: [
           {
             text: '详情',
-            click: (_record, _modal, _instance) => this.channelView(_record),
+            click: (_record, _modal, _instance) => this.channelView(_record)
           },
           {
             text: '审核',
-            click: (_record, _modal, _instance) => this.channelView(_record),
+            click: (_record, _modal, _instance) => this.channelView(_record)
-          },
+          }
-
         ]
       }
     ];
@@ -211,8 +203,8 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
     // this.st1?.load(1);
   }
 
-  tabChange(index:any){
+  tabChange(index: any) {
-    console.log(index)
+    console.log(index);
     switch (index) {
       case 0:
         this.initST1();
@@ -224,5 +216,4 @@ export class ParterAdviceFeedbackListComponent implements OnInit {
         break;
     }
   }
-
 }

src/app/routes/partner/article-management/components/edit/edit.component.ts

@@ -1,11 +1,15 @@
-import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
-import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form';
+import {
-import { _HttpClient } from '@delon/theme';
+  SFComponent,
+  SFRadioWidgetSchema,
+  SFSchema,
+  SFSelectWidgetSchema,
+  SFTextareaWidgetSchema,
+  SFUISchema,
+  SFUploadWidgetSchema
+} from '@delon/form';
 import { Observable, Observer } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
 import { ChannelSalesService } from '../../services/channel-sales.service';
 
 @Component({
@@ -19,12 +23,7 @@ export class ParterArticleManagementEditComponent implements OnInit {
   i: any;
   type: any;
 
-  constructor(
+  constructor(public service: ChannelSalesService) {}
-    public http: _HttpClient,
-    private cdr: ChangeDetectorRef,
-    private route: ActivatedRoute,
-    public service: ChannelSalesService,
-  ) {}
 
   ngOnInit(): void {
     this.initSF();
@@ -44,8 +43,8 @@ export class ParterArticleManagementEditComponent implements OnInit {
           ui: {
             widget: 'textarea',
             autosize: { minRows: 3, maxRows: 6 },
-            placeholder:'请输入50字符'
+            placeholder: '请输入50字符'
-          } as SFTextareaWidgetSchema,
+          } as SFTextareaWidgetSchema
         },
         name2: {
           type: 'string',
@@ -54,8 +53,8 @@ export class ParterArticleManagementEditComponent implements OnInit {
           ui: {
             widget: 'textarea',
             autosize: { minRows: 3, maxRows: 6 },
-            placeholder:'请输入50字符'
+            placeholder: '请输入50字符'
-          } as SFTextareaWidgetSchema,
+          } as SFTextareaWidgetSchema
         },
         name3: {
           type: 'string',
@@ -89,12 +88,10 @@ export class ParterArticleManagementEditComponent implements OnInit {
         name: {
           title: '分类',
           type: 'string',
-          enum: [
+          enum: [{ label: '管理员', value: '1' }],
-            { label: '管理员', value: '1'},
-          ],
           ui: {
-            widget: 'select',
+            widget: 'select'
-          } as SFSelectWidgetSchema,
+          } as SFSelectWidgetSchema
         },
         name4: {
           type: 'number',
@@ -102,21 +99,21 @@ export class ParterArticleManagementEditComponent implements OnInit {
           minimum: 0,
           maximum: 99,
           ui: {
-            widgetWidth: 300 ,
+            widgetWidth: 300,
-            placeholder:'请输入0~99，数字越大，排序越靠前'
+            placeholder: '请输入0~99，数字越大，排序越靠前'
           }
         },
         name5: {
           type: 'string',
           title: '跳转路径',
           enum: [
-            { label: '图文', value: '1'},
+            { label: '图文', value: '1' },
-            { label: '视频', value: '2'},
+            { label: '视频', value: '2' }
           ],
           ui: {
-            widget: 'radio',
+            widget: 'radio'
           } as SFRadioWidgetSchema,
-          default: '1',
+          default: '1'
         },
         content: {
           type: 'string',
@@ -128,7 +125,7 @@ export class ParterArticleManagementEditComponent implements OnInit {
               height: 450
             },
             visibleIf: { name5: (value: string) => value === '1' }
-          },
+          }
         },
         name6: {
           type: 'string',
@@ -159,7 +156,7 @@ export class ParterArticleManagementEditComponent implements OnInit {
             },
             visibleIf: { name5: (value: string) => value === '2' }
           } as SFUploadWidgetSchema
-        },
+        }
       },
       required: ['name1', 'name2']
     };
@@ -167,17 +164,14 @@ export class ParterArticleManagementEditComponent implements OnInit {
       '*': {
         spanLabelFixed: 150,
         grid: { span: 20 }
-      },
+      }
-
     };
   }
 
-  close() {
+  close() {}
-    
-  }
   save() {
     this.sf.validator({ emitError: true });
-    if(!this.sf.valid) return;
+    if (!this.sf.valid) return;
     // this.service.request('', { ...this.sf?.value }).subscribe(res => {
     //   if (res) {
     //     this.modalRef.destroy(true);

src/app/routes/partner/article-management/components/list/list.component.ts

@@ -1,11 +1,9 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { processSingleSort } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ChannelSalesService } from '../../services/channel-sales.service';
-import { ParterArticleManagementEditComponent } from '../edit/edit.component';
 
 @Component({
   selector: 'app-parter-article-management-list',
@@ -22,13 +20,8 @@ export class ParterArticleManagementListComponent implements OnInit {
   spuStatus = '1';
   _$expand = false;
 
-  data=[{name1:1111}]
+  data = [{ name1: 1111 }];
-  constructor(
+  constructor(public router: Router, public service: ChannelSalesService, private modalService: NzModalService) {}
-    public router: Router,
-    public ar: ActivatedRoute,
-    public service: ChannelSalesService,
-    private modalService: NzModalService
-  ) {}
 
   /**
    * 查询参数
@@ -91,8 +84,7 @@ export class ParterArticleManagementListComponent implements OnInit {
               _$expand: (value: boolean) => value
             }
           }
-        },
+        }
-       
       }
     };
     this.ui = {
@@ -138,19 +130,19 @@ export class ParterArticleManagementListComponent implements OnInit {
         buttons: [
           {
             text: '修改',
-            click: (_record, _modal, _instance) => this.edit(_record),
+            click: (_record, _modal, _instance) => this.edit(_record)
           },
           {
             text: '禁用',
-            click: (_record, _modal, _instance) => this.stop(_record),
+            click: (_record, _modal, _instance) => this.stop(_record)
           },
           {
             text: '启用',
-            click: (_record, _modal, _instance) => this.start(_record.id),
+            click: (_record, _modal, _instance) => this.start(_record.id)
           },
           {
             text: '推荐到首页',
-            click: (_record, _modal, _instance) => this.recommend(_record.id),
+            click: (_record, _modal, _instance) => this.recommend(_record.id)
           }
         ]
       }
@@ -166,11 +158,10 @@ export class ParterArticleManagementListComponent implements OnInit {
     this.router.navigate(['/partner/knowledge/article-management-edit'], { queryParams: {} });
   }
 
- 
   stop(record: STData) {
     this.modalService.confirm({
       nzTitle: '<i>禁用确认</i>',
-      nzContent: `<b>确定禁用此文章吗？</br>`,
+      nzContent: `<b>确定禁用此文章吗？</br>`
       // nzOnOk: () =>
       //   this.service.request('', '').subscribe(res => {
       //     if (res) {
@@ -183,7 +174,7 @@ export class ParterArticleManagementListComponent implements OnInit {
   start(record: STData) {
     this.modalService.confirm({
       nzTitle: '<i>启用确认</i>',
-      nzContent: `<b>确定启用此文章吗？</br>`,
+      nzContent: `<b>确定启用此文章吗？</br>`
       // nzOnOk: () =>
       //   this.service.request('', '').subscribe(res => {
       //     if (res) {
@@ -193,8 +184,5 @@ export class ParterArticleManagementListComponent implements OnInit {
       //   })
     });
   }
-  recommend(record: STData) {
+  recommend(record: STData) {}
-   
-  }
-  
 }

src/app/routes/partner/channel-sales/components/list/list.component.ts

@@ -1,8 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
-import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { STColumn, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { processSingleSort } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ChannelSalesService } from '../../services/channel-sales.service';
 import { ParterChannelSalesEditComponent } from '../edit/edit.component';
@@ -24,7 +23,6 @@ export class ParterChannelSalesListComponent implements OnInit {
   data = [{ name1: 1111 }]
   constructor(
     public router: Router,
-    public ar: ActivatedRoute,
     public service: ChannelSalesService,
     private modalService: NzModalService
   ) { }

src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts

@@ -1,13 +1,8 @@
-import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
-import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { NzModalRef } from 'ng-zorro-antd/modal';
-import { _HttpClient } from '@delon/theme';
-import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
-import { map } from 'rxjs/operators';
-import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
 import { ClaimAuditService } from '../../services/claim-audit.service';
 
-
 @Component({
   selector: 'app-parter-claim-audit-channel-approve',
   templateUrl: './channel-approve.component.html'
@@ -19,14 +14,7 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
   i: any;
   type: any;
 
-  constructor(
+  constructor(public service: ClaimAuditService, private modalRef: NzModalRef) {}
-    public http: _HttpClient,
-    private cdr: ChangeDetectorRef,
-    private route: ActivatedRoute,
-    private modalService: NzModalService,
-    public service: ClaimAuditService,
-    private modalRef: NzModalRef
-  ) {}
 
   ngOnInit(): void {
     this.initSF();
@@ -43,20 +31,20 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
           title: '合伙人(认领人)',
           type: 'string',
           ui: {
-            widget: 'text',
+            widget: 'text'
-          } ,
+          }
         },
         name2: {
           title: '认领客户名称',
           type: 'string',
           ui: {
-            widget: 'text',
+            widget: 'text'
-          } ,
+          }
         },
         data: {
           title: '结算起算日期',
           type: 'string',
-          format: 'date',
+          format: 'date'
         },
         name3: {
           type: 'string',
@@ -65,9 +53,9 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
           ui: {
             widget: 'textarea',
             autosize: { minRows: 3, maxRows: 6 },
-            placeholder:'请不要超过50个字'
+            placeholder: '请不要超过50个字'
-          } as SFTextareaWidgetSchema,
+          } as SFTextareaWidgetSchema
-        },
+        }
       },
       required: ['name3']
     };
@@ -75,7 +63,7 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
       '*': {
         spanLabelFixed: 120,
         grid: { span: 24 }
-      },
+      }
     };
   }
 
@@ -84,7 +72,7 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
   }
   save() {
     this.sf.validator({ emitError: true });
-    if(!this.sf.valid) return;
+    if (!this.sf.valid) return;
     // this.service.request('', { ...this.sf?.value }).subscribe(res => {
     //   if (res) {
     //     this.modalRef.destroy(true);
@@ -93,6 +81,4 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
     //   }
     // });
   }
-
-  
 }

src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.ts

@@ -2,11 +2,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } 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 { ClaimAuditService } from '../../services/claim-audit.service';
 import { ParterClaimAuditListChannelApproveComponent } from '../channel-approve/channel-approve.component';
@@ -34,10 +30,8 @@ export class ParterClaimAuditListChannelDetailComponent implements OnInit {
 
   constructor(
     private route: ActivatedRoute,
-    private msgSrv: NzMessageService,
     private service: ClaimAuditService,
     private modalService: NzModalService,
-    private router: Router
   ) {}
 
   ngOnInit(): void {

src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts

@@ -1,13 +1,8 @@
-import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
-import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { NzModalRef } from 'ng-zorro-antd/modal';
-import { _HttpClient } from '@delon/theme';
-import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
-import { map } from 'rxjs/operators';
-import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
 import { ClaimAuditService } from '../../services/claim-audit.service';
 
-
 @Component({
   selector: 'app-parter-claim-audit-channel-reject',
   templateUrl: './channel-reject.component.html'
@@ -19,14 +14,7 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
   i: any;
   type: any;
 
-  constructor(
+  constructor(public service: ClaimAuditService, private modalRef: NzModalRef) {}
-    public http: _HttpClient,
-    private cdr: ChangeDetectorRef,
-    private route: ActivatedRoute,
-    private modalService: NzModalService,
-    public service: ClaimAuditService,
-    private modalRef: NzModalRef
-  ) {}
 
   ngOnInit(): void {
     this.initSF();
@@ -43,20 +31,20 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
           title: '合伙人(认领人)',
           type: 'string',
           ui: {
-            widget: 'text',
+            widget: 'text'
-          } ,
+          }
         },
         name2: {
           title: '认领客户名称',
           type: 'string',
           ui: {
-            widget: 'text',
+            widget: 'text'
-          } ,
+          }
         },
         data: {
           title: '结算起算日期',
           type: 'string',
-          format: 'date',
+          format: 'date'
         },
         name3: {
           type: 'string',
@@ -65,9 +53,9 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
           ui: {
             widget: 'textarea',
             autosize: { minRows: 3, maxRows: 6 },
-            placeholder:'请不要超过50个字'
+            placeholder: '请不要超过50个字'
-          } as SFTextareaWidgetSchema,
+          } as SFTextareaWidgetSchema
-        },
+        }
       },
       required: ['name3']
     };
@@ -75,7 +63,7 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
       '*': {
         spanLabelFixed: 120,
         grid: { span: 24 }
-      },
+      }
     };
   }
 
@@ -84,7 +72,7 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
   }
   save() {
     this.sf.validator({ emitError: true });
-    if(!this.sf.valid) return;
+    if (!this.sf.valid) return;
     // this.service.request('', { ...this.sf?.value }).subscribe(res => {
     //   if (res) {
     //     this.modalRef.destroy(true);
@@ -93,6 +81,4 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
     //   }
     // });
   }
-
-  
 }

src/app/routes/partner/claim-audit/components/list/list.component.ts

@@ -1,9 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
-import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { STColumn, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { processSingleSort } from '@shared';
-import { NzModalService } from 'ng-zorro-antd/modal';
 import { ClaimAuditService } from '../../services/claim-audit.service';
 
 @Component({
@@ -24,13 +22,8 @@ export class ParterClaimAuditListComponent implements OnInit {
   _$expand = false;
   selectedIndex = 0;
 
-  data=[{name1:1111}]
+  data = [{ name1: 1111 }];
-  constructor(
+  constructor(public router: Router, public service: ClaimAuditService) {}
-    public router: Router,
-    public ar: ActivatedRoute,
-    public service: ClaimAuditService,
-    private modalService: NzModalService
-  ) {}
 
   /**
    * 查询参数
@@ -91,7 +84,7 @@ export class ParterClaimAuditListComponent implements OnInit {
               _$expand: (value: boolean) => value
             }
           }
-        },
+        }
       }
     };
     this.ui = {
@@ -141,12 +134,12 @@ export class ParterClaimAuditListComponent implements OnInit {
         buttons: [
           {
             text: '详情',
-            click: (_record, _modal, _instance) => this.partnerView(_record),
+            click: (_record, _modal, _instance) => this.partnerView(_record)
           },
           {
             text: '审核',
-            click: (_record, _modal, _instance) => this.partnerView(_record),
+            click: (_record, _modal, _instance) => this.partnerView(_record)
-          },
+          }
         ]
       }
     ];
@@ -184,13 +177,12 @@ export class ParterClaimAuditListComponent implements OnInit {
         buttons: [
           {
             text: '详情',
-            click: (_record, _modal, _instance) => this.channelView(_record),
+            click: (_record, _modal, _instance) => this.channelView(_record)
           },
           {
             text: '审核',
-            click: (_record, _modal, _instance) => this.channelView(_record),
+            click: (_record, _modal, _instance) => this.channelView(_record)
-          },
+          }
-
         ]
       }
     ];
@@ -213,8 +205,8 @@ export class ParterClaimAuditListComponent implements OnInit {
     // this.st1?.load(1);
   }
 
-  tabChange(index:any){
+  tabChange(index: any) {
-    console.log(index)
+    console.log(index);
     switch (index) {
       case 0:
         this.initST1();
@@ -226,5 +218,4 @@ export class ParterClaimAuditListComponent implements OnInit {
         break;
     }
   }
-
 }

src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts

@@ -1,13 +1,9 @@
-import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
-import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
 import { _HttpClient } from '@delon/theme';
-import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { NzModalRef } from 'ng-zorro-antd/modal';
-import { map } from 'rxjs/operators';
-import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
 import { ClaimAuditService } from '../../services/claim-audit.service';
 
-
 @Component({
   selector: 'app-parter-claim-audit-partner-approve',
   templateUrl: './partner-approve.component.html'
@@ -19,14 +15,7 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
   i: any;
   type: any;
 
-  constructor(
+  constructor(public service: ClaimAuditService, private modalRef: NzModalRef) {}
-    public http: _HttpClient,
-    private cdr: ChangeDetectorRef,
-    private route: ActivatedRoute,
-    private modalService: NzModalService,
-    public service: ClaimAuditService,
-    private modalRef: NzModalRef
-  ) {}
 
   ngOnInit(): void {
     this.initSF();
@@ -43,20 +32,20 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
           title: '合伙人(认领人)',
           type: 'string',
           ui: {
-            widget: 'text',
+            widget: 'text'
-          } ,
+          }
         },
         name2: {
           title: '认领客户名称',
           type: 'string',
           ui: {
-            widget: 'text',
+            widget: 'text'
-          } ,
+          }
         },
         data: {
           title: '结算起算日期',
           type: 'string',
-          format: 'date',
+          format: 'date'
         },
         name3: {
           type: 'string',
@@ -65,9 +54,9 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
           ui: {
             widget: 'textarea',
             autosize: { minRows: 3, maxRows: 6 },
-            placeholder:'请不要超过50个字'
+            placeholder: '请不要超过50个字'
-          } as SFTextareaWidgetSchema,
+          } as SFTextareaWidgetSchema
-        },
+        }
       },
       required: ['name3']
     };
@@ -75,7 +64,7 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
       '*': {
         spanLabelFixed: 120,
         grid: { span: 24 }
-      },
+      }
     };
   }
 
@@ -84,7 +73,7 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
   }
   save() {
     this.sf.validator({ emitError: true });
-    if(!this.sf.valid) return;
+    if (!this.sf.valid) return;
     // this.service.request('', { ...this.sf?.value }).subscribe(res => {
     //   if (res) {
     //     this.modalRef.destroy(true);
@@ -93,6 +82,4 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
     //   }
     // });
   }
-
-  
 }

src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.ts

@@ -1,13 +1,7 @@
-
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+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 { ClaimAuditService } from '../../services/claim-audit.service';
 import { ParterClaimAuditListPartnerRejectComponent } from '../partner-reject/partner-reject.component';
 import { ParterClaimAuditListPartnerApproveComponent } from '../partner-approve/partner-approve.component';
 
@@ -23,21 +17,15 @@ export class ParterClaimAuditListPartnerDetailComponent implements OnInit {
   isVisible = false;
   columns: STColumn[] = [
     { title: '操作时间', index: 'id', width: 120 },
-    { title: '操作人', type: 'img', width: 120, },
+    { title: '操作人', type: 'img', width: 120 },
     { title: '操作人手机号', index: 'email', width: 120 },
     { title: '操作页面', index: 'phone' },
     { title: '操作内容', index: 'registered' }
   ];
 
-  data=[{id:11111}]
+  data = [{ id: 11111 }];
 
-  constructor(
+  constructor(private route: ActivatedRoute, private modalService: NzModalService) {}
-    private route: ActivatedRoute,
-    private msgSrv: NzMessageService,
-    private service: ClaimAuditService,
-    private modalService: NzModalService,
-    private router: Router
-  ) {}
 
   ngOnInit(): void {
     this.initData();
@@ -77,6 +65,4 @@ export class ParterClaimAuditListPartnerDetailComponent implements OnInit {
   goBack() {
     window.history.go(-1);
   }
-
-
 }

src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts

@@ -1,13 +1,8 @@
-import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
-import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { NzModalRef } from 'ng-zorro-antd/modal';
-import { _HttpClient } from '@delon/theme';
-import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
-import { map } from 'rxjs/operators';
-import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
 import { ClaimAuditService } from '../../services/claim-audit.service';
 
-
 @Component({
   selector: 'app-parter-claim-audit-partner-reject',
   templateUrl: './partner-reject.component.html'
@@ -19,14 +14,7 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
   i: any;
   type: any;
 
-  constructor(
+  constructor(public service: ClaimAuditService, private modalRef: NzModalRef) {}
-    public http: _HttpClient,
-    private cdr: ChangeDetectorRef,
-    private route: ActivatedRoute,
-    private modalService: NzModalService,
-    public service: ClaimAuditService,
-    private modalRef: NzModalRef
-  ) {}
 
   ngOnInit(): void {
     this.initSF();
@@ -43,20 +31,20 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
           title: '合伙人(认领人)',
           type: 'string',
           ui: {
-            widget: 'text',
+            widget: 'text'
-          } ,
+          }
         },
         name2: {
           title: '认领客户名称',
           type: 'string',
           ui: {
-            widget: 'text',
+            widget: 'text'
-          } ,
+          }
         },
         data: {
           title: '结算起算日期',
           type: 'string',
-          format: 'date',
+          format: 'date'
         },
         name3: {
           type: 'string',
@@ -65,9 +53,9 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
           ui: {
             widget: 'textarea',
             autosize: { minRows: 3, maxRows: 6 },
-            placeholder:'请不要超过50个字'
+            placeholder: '请不要超过50个字'
-          } as SFTextareaWidgetSchema,
+          } as SFTextareaWidgetSchema
-        },
+        }
       },
       required: ['name3']
     };
@@ -75,7 +63,7 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
       '*': {
         spanLabelFixed: 120,
         grid: { span: 24 }
-      },
+      }
     };
   }
 
@@ -84,7 +72,7 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
   }
   save() {
     this.sf.validator({ emitError: true });
-    if(!this.sf.valid) return;
+    if (!this.sf.valid) return;
     // this.service.request('', { ...this.sf?.value }).subscribe(res => {
     //   if (res) {
     //     this.modalRef.destroy(true);
@@ -93,6 +81,4 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
     //   }
     // });
   }
-
-  
 }

src/app/routes/partner/knowledge/banner/components/list/list.component.ts

@@ -12,7 +12,6 @@ import { BannerService } from '../../services/banner.service';
   templateUrl: './list.component.html',
   styleUrls: ['./list.component.less']
 })
-
 export class BannerComponentsListComponent implements OnInit {
   schema: SFSchema = {};
   columns: STColumn[] = [];
@@ -27,7 +26,14 @@ export class BannerComponentsListComponent implements OnInit {
 
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
-  constructor(public service: BannerService, private modal: ModalHelper, private msg: NzMessageService, private router: Router, private modalSrv: NzModalService,  private ar: ActivatedRoute) { }
+  constructor(
+    public service: BannerService,
+    private modal: ModalHelper,
+    private msg: NzMessageService,
+    private router: Router,
+    private modalSrv: NzModalService,
+    private ar: ActivatedRoute
+  ) {}
 
   /**
    * 查询字段个数
@@ -51,14 +57,14 @@ export class BannerComponentsListComponent implements OnInit {
     if (params.navigationId === '') {
       delete params.navigationId;
     }
-    return { ...params};
+    return { ...params };
   }
 
   /**
    * 选中行
    */
   get selectedRows() {
-    return this.st?.list.filter((item) => item.checked) || [];
+    return this.st?.list.filter(item => item.checked) || [];
   }
   ngOnInit() {
     this.initSF();
@@ -80,8 +86,8 @@ export class BannerComponentsListComponent implements OnInit {
         _$expand: {
           type: 'boolean',
           ui: {
-            hidden: true,
+            hidden: true
-          },
+          }
         },
         name: {
           type: 'string',
@@ -89,7 +95,7 @@ export class BannerComponentsListComponent implements OnInit {
           maxLength: 10,
           ui: {
             widget: '',
-            placeholder: '请输入',
+            placeholder: '请输入'
           }
         },
         status: {
@@ -98,21 +104,21 @@ export class BannerComponentsListComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            allowClear: true,
+            allowClear: true
           } as SFSelectWidgetSchema,
           enum: [
             { label: '全部', value: 1 },
             { label: '正常', value: 2 },
             { label: '禁用', value: 3 }
           ]
-        },
+        }
-      },
+      }
     };
     this.ui = {
       '*': {
         spanLabelFixed: 110,
-        grid: { span: 8 },
+        grid: { span: 8 }
-      },
+      }
     };
   }
 
@@ -140,7 +146,7 @@ export class BannerComponentsListComponent implements OnInit {
         type: 'enum',
         enum: {
           1: '正常',
-          2: '禁用',
+          2: '禁用'
         }
       },
       {
@@ -157,7 +163,7 @@ export class BannerComponentsListComponent implements OnInit {
           {
             text: '修改',
             acl: { ability: ['banner-change'] },
-            click: (item) => {
+            click: item => {
               this.router.navigate(['../detail'], { queryParams: { id: item.id, type: 'edit' }, relativeTo: this.ar });
             }
           },
@@ -167,12 +173,12 @@ export class BannerComponentsListComponent implements OnInit {
             pop: {
               title: `确定禁用此banner图吗？？`,
               okType: 'danger',
-              icon: 'alert',
+              icon: 'alert'
             },
-            click: (item) => {
+            click: item => {
               this.changeStatus(item.id);
             },
-            iif: (item) => item.status === 1
+            iif: item => item.status === 1
           },
           {
             text: '启用',
@@ -180,15 +186,15 @@ export class BannerComponentsListComponent implements OnInit {
             pop: {
               title: `确定启用此banner图吗？`,
               okType: 'danger',
-              icon: 'success',
+              icon: 'success'
             },
-            click: (item) => {
+            click: item => {
               this.changeStatus(item);
             },
-            iif: (item) => item.status === 2
+            iif: item => item.status === 2
-          },
+          }
-        ],
+        ]
-      },
+      }
     ];
   }
   changeStatus(item: any) {
@@ -216,7 +222,7 @@ export class BannerComponentsListComponent implements OnInit {
   resetSF() {
     this.sf.reset();
     this._$expand = false;
-    this.isLoading = true
+    this.isLoading = true;
   }
 
   /**

src/app/routes/partner/level-config/components/edit/edit.component.ts

@@ -1,10 +1,17 @@
-import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+/*
-import { ActivatedRoute } from '@angular/router';
+ * @Description  : 
-import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-28 20:27:22
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-05-07 18:04:15
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\level-config\\components\\edit\\edit.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { Component,  OnInit, ViewChild } from '@angular/core';
+import { SFComponent, SFSchema,  SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
 import { _HttpClient } from '@delon/theme';
-import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { NzModalRef } from 'ng-zorro-antd/modal';
-import { map } from 'rxjs/operators';
-import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
 import { ChannelSalesService } from '../../services/level-config.service';
 
 @Component({
@@ -19,10 +26,6 @@ export class ParterLevelConfigEditComponent implements OnInit {
   type: any;
 
   constructor(
-    public http: _HttpClient,
-    private cdr: ChangeDetectorRef,
-    private route: ActivatedRoute,
-    private modalService: NzModalService,
     public service: ChannelSalesService,
     private modalRef: NzModalRef
   ) {}
@@ -41,10 +44,17 @@ export class ParterLevelConfigEditComponent implements OnInit {
         gradeName: {
           title: '等级名称',
           type: 'string',
+          maxLength: 12
         },
         sortId: {
           title: '排序',
-          type: 'string',
+          minimum: 0,
+          type:"number",
+          ui: {
+            change: (item: any) => {
+             this.sf.setValue('/sortId', item?.toFixed(0))
+            }
+          }
         },
         remark: {
           type: 'string',

src/app/routes/partner/level-config/components/list/list.component.ts

@@ -1,8 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { processSingleSort } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ChannelSalesService } from '../../services/level-config.service';
 import { ParterLevelConfigEditComponent } from '../edit/edit.component';
@@ -23,8 +21,6 @@ export class ParterLevelConfigListComponent implements OnInit {
 
   data = [{ name1: 1111 }];
   constructor(
-    public router: Router,
-    public ar: ActivatedRoute,
     public service: ChannelSalesService,
     private modalService: NzModalService
   ) {}

src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts

@@ -1,5 +1,4 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import { STColumn } from '@delon/abc/st';
 import { PartnerListService } from '../../services/partner-list.service';
 
@@ -10,7 +9,7 @@ import { PartnerListService } from '../../services/partner-list.service';
 export class ChannelLogModalComponent implements OnInit {
   columns: { changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST();
   id = '';
-  constructor(public service: PartnerListService, public route: ActivatedRoute) {}
+  constructor(public service: PartnerListService) {}
 
   ngOnInit(): void {}
 

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
+          #rest
+          [data]="service.$api_get_enterprice_rel_list"
+          [columns]="[
             { title: '', index: 'key', type: 'checkbox' },
-        { title: '客户名称', index: 'enterpriceName' }
+            { title: '客户名称', index: 'enterpriseName' }
-        ]" [req]="{ process: beforeReq,params:{effectiveStatus:2 ,newPartnerId:selectItem.id} }"
+          ]"
-          [loading]="service.http.loading" [page]="{show:false}" (change)="stChange($event)">
+          [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"
+    >客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起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/partner/rebate-management/components/particulars/particulars.component.ts

@@ -1,9 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent } from '@delon/abc/st';
-import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
-import { processSingleSort, ShipperBaseService } from '@shared';
+import { ShipperBaseService } from '@shared';
-import { NzModalService } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../services/rebate-management.service';
 
 @Component({
@@ -27,10 +25,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
   resourceStatus: any;
   data = this.service.$api_get_searchPageList;
   constructor(
-    public router: Router,
-    public ar: ActivatedRoute,
     public service: RebateManagementService,
-    private modalService: NzModalService,
     public shipperservice: ShipperBaseService
   ) {}
   /**

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

@@ -1,6 +1,4 @@
-import { ModalHelper } from '@delon/theme';
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { processSingleSort, ShipperBaseService } from '@shared';
@@ -25,8 +23,6 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
   _$expand = false;
   data = [{ name1: 1111 }];
   constructor(
-    public router: Router,
-    public ar: ActivatedRoute,
     public service: RebateManagementService,
     private modal: NzModalService,
     public shipperservice: ShipperBaseService,

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

@@ -1,12 +1,10 @@
-import { ModalHelper } from '@delon/theme';
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
-import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { STColumn, STComponent } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { processSingleSort, ShipperBaseService } from '@shared';
+import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../services/rebate-management.service';
-import { ParterRebateManageMenRecordDetailComponent } from '../../model/record-detail/record-detail.component';
 import { ParterRebateManageMenAbnormalFeedbackComponent } from '../../model/abnormal-feedback/abnormal-feedback.component';
 
 @Component({
@@ -25,10 +23,9 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
   _$expand = false;
   constructor(
     public router: Router,
-    public ar: ActivatedRoute,
     public service: RebateManagementService,
     private modal: NzModalService,
-    public shipperservice: ShipperBaseService,
+    public shipperservice: ShipperBaseService
   ) {}
   /**
    * 查询参数
@@ -36,7 +33,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
   get reqParams() {
     const params: any = Object.assign({}, this.sf?.value || {});
     return {
-      ...params,
+      ...params
     };
   }
   ngOnInit() {
@@ -49,21 +46,20 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
       properties: {
         configName: {
           type: 'string',
-          title: '模板名称',
+          title: '模板名称'
         },
         stateLocked: {
           type: 'string',
           title: '状态',
           enum: [
-            {label: '全部', value: ''},
+            { label: '全部', value: '' },
-            {label: '生效中', value: 1},
+            { label: '生效中', value: 1 },
-            {label: '失效', value: 0},
+            { label: '失效', value: 0 }
           ],
           ui: {
-            widget: 'select',
+            widget: 'select'
-          },
+          }
-        
+        }
-        },
       }
     };
     this.ui = {
@@ -79,43 +75,42 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
       {
         title: '模板名称',
         index: 'configName',
-        width: '200px',
+        width: '200px'
       },
       {
         title: '等级类型',
         render: 'configType',
-        width: '200px',
+        width: '200px'
-
       },
       {
         title: '备注',
         index: 'remark',
-        width: '250px',
+        width: '250px'
       },
       {
         title: '合伙人范围',
         render: 'partnerType',
-        width: '200px',
+        width: '200px'
       },
       {
         title: '创建时间',
         index: 'enableTime',
-        width: '200px',
+        width: '200px'
       },
       {
         title: '生效时间',
         index: 'enableTime',
-        width: '200px',
+        width: '200px'
       },
       {
         title: '优先级',
         index: 'priority',
-        width: '100px',
+        width: '100px'
       },
       {
         title: '状态',
         render: 'stateLocked',
-        width: '100px',
+        width: '100px'
       },
       {
         title: '操作',
@@ -126,20 +121,24 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
           {
             text: '查看',
             acl: { ability: ['REBATE-SETTING-detail'] },
-            click: _record => this.configAction(_record),
+            click: _record => this.configAction(_record)
           },
           {
             text: '禁用',
             acl: { ability: ['REBATE-SETTING-forbidden'] },
-            iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 ||  _record.partnerType == 2)},
+            iif: _record => {
-            click: _record => this.viewEvaluate(_record),
+              return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2);
+            },
+            click: _record => this.viewEvaluate(_record)
           },
           {
             text: '启用',
             acl: { ability: ['REBATE-SETTING-startUseing'] },
-            iif: (_record) =>{ return _record.stateLocked == false},
+            iif: _record => {
-            click: _record => this.viewEvaluate(_record),
+              return _record.stateLocked == false;
             },
+            click: _record => this.viewEvaluate(_record)
+          }
         ]
       }
     ];
@@ -149,28 +148,28 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
    */
   viewEvaluate(item: any) {
     console.log(item.stateLocked);
-     let title = ''
+    let title = '';
     let stateLocked: boolean;
-     if(item.stateLocked) {
+    if (item.stateLocked) {
-       title = '是否禁用该配置？'
+      title = '是否禁用该配置？';
-       stateLocked = false
+      stateLocked = false;
     } else {
-       title = '是否启用该配置？'
+      title = '是否启用该配置？';
-       stateLocked = true
+      stateLocked = true;
     }
     this.modal.confirm({
       nzTitle: title,
       nzOnOk: () => {
         const params = {
           id: item?.id,
-          stateLocked: stateLocked,
+          stateLocked: stateLocked
-        }
+        };
-          this.service.request(this.service.$api_set_updateRebateConfig,params).subscribe((res: any) => { 
+        this.service.request(this.service.$api_set_updateRebateConfig, params).subscribe((res: any) => {
-            if(res) {
+          if (res) {
-              this.service.msgSrv.success('设置成功！')
+            this.service.msgSrv.success('设置成功！');
             this.st.reload();
           }
-          })
+        });
       }
     });
   }
@@ -191,7 +190,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
     });
   }
   configAction(value?: any) {
-    this.router.navigate(['/partner/rebate/setting/add/', '0'], {queryParams: value})
+    this.router.navigate(['/partner/rebate/setting/add/', '0'], { queryParams: value });
   }
   /**
    * 重置表单

src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts

@@ -8,15 +8,11 @@
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
-import { ModalHelper } from '@delon/theme';
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
-import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { ShipperBaseService } from '@shared';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { NzModalRef } from 'ng-zorro-antd/modal';
-import { processSingleSort, ShipperBaseService } from '@shared';
-import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../services/rebate-management.service';
-import { NzButtonSize } from 'ng-zorro-antd/button';
 
 @Component({
   selector: 'app-parter-channel-rebate-management-abnormal-feedback',
@@ -29,15 +25,7 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
   sf!: SFComponent;
   i!: any;
   data = [{ name1: 1111 }];
-  constructor(
+  constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {}
-    public router: Router,
-    public ar: ActivatedRoute,
-    public service: RebateManagementService,
-    private modalService: NzModalService,
-    public shipperservice: ShipperBaseService,
-    public modalRef: NzModalRef,
-  ) {}
-
 
   ngOnInit() {
     this.initSF();
@@ -53,20 +41,19 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
           ui: {
             widget: 'textarea',
             autosize: { minRows: 3, maxRows: 6 },
-            placeholder:'请不要超过50个字'
+            placeholder: '请不要超过50个字'
-          } as SFTextareaWidgetSchema,
+          } as SFTextareaWidgetSchema
-        },
+        }
       }
     };
     this.ui = {
       '*': {
         spanLabelFixed: 60,
-        grid: { span: 16 },
+        grid: { span: 16 }
       }
     };
   }
   close() {
-    this.modalRef.destroy()
+    this.modalRef.destroy();
   }
 }
-

src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts

@@ -1,10 +1,8 @@
-import { ModalHelper } from '@delon/theme';
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent } from '@delon/abc/st';
-import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ShipperBaseService } from '@shared';
-import { processSingleSort, ShipperBaseService } from '@shared';
+import { NzModalRef } from 'ng-zorro-antd/modal';
-import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../services/rebate-management.service';
 import { NzButtonSize } from 'ng-zorro-antd/button';
 
@@ -24,14 +22,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
   size: NzButtonSize = 'large';
   _$expand = false;
   data = [{ name1: 1111 }];
-  constructor(
+  constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {}
-    public router: Router,
-    public ar: ActivatedRoute,
-    public service: RebateManagementService,
-    private modalService: NzModalService,
-    public shipperservice: ShipperBaseService,
-    public modalRef: NzModalRef,
-  ) {}
   /**
    * 查询字段个数
    */
@@ -52,7 +43,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
     return {
-      ...params,
+      ...params
     };
   }
   ngOnInit() {
@@ -72,8 +63,8 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
             allowClear: true,
             asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
             change: (value: any) => {
-              console.log(value)
+              console.log(value);
-              this.st.reload()
+              this.st.reload();
             }
           }
         },
@@ -85,11 +76,11 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
             params: { dictKey: 'overall:payment:status' },
             containsAllLabel: true,
             change: (value: any) => {
-              console.log(value)
+              console.log(value);
-              this.st.reload()
+              this.st.reload();
             }
           } as SFSelectWidgetSchema
-        },
+        }
       }
     };
     this.ui = {
@@ -165,7 +156,6 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     this.st.load(1);
   }
   close() {
-    this.modalRef.destroy()
+    this.modalRef.destroy();
   }
 }
-

src/app/routes/partner/recorded/components/detail/detail.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
 import { RecordedService } from '../../services/recorded.service';
 
 

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

@@ -1,5 +1,4 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
 import { cacheConf } from '@conf/cache.conf';
 import { STColumn, STComponent, STChange, STData } from '@delon/abc/st';
 import { SFUISchema, SFSchema, SFComponent } from '@delon/form';
@@ -28,7 +27,7 @@ export class CarAddmodalComponent implements OnInit {
   constructor(
     private modal: NzModalRef,
     private eaCacheSrv: EACacheService,
-    public service: SupplyManagementService, private router: Router, private ar: ActivatedRoute,
+    public service: SupplyManagementService,
     private modalHelper: ModalHelper
   ) { }
 

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

@@ -39,7 +39,7 @@
                       name="loadName{{ idx }}" maxlength="30" placeholder="请输入联系人姓名" />
                   </nz-form-control>
                   <nz-form-control [nzSpan]="12" [nzErrorTip]="'请输入联系人电话'">
-                    <input nz-input [(ngModel)]="data1.contractTelephone" maxlength="11"
+                    <input nz-input [(ngModel)]="data1.contractTelephone" maxlength="11" (ngModelChange)="onChangePhone(data1.contractTelephone)"
                       formControlName="loadPhone{{ idx }}" name="loadPhone{{ idx }}" placeholder="请输入联系人电话" />
                   </nz-form-control>
                 </div>
@@ -74,7 +74,7 @@
                       name="unloadAddress{{ idx }}" placeholder="请输入联系人姓名" />
                   </nz-form-control>
                   <nz-form-control [nzSpan]="12" [nzErrorTip]="'请输入联系人电话'">
-                    <input nz-input [(ngModel)]="data2.contractTelephone"
+                    <input nz-input [(ngModel)]="data2.contractTelephone" (ngModelChange)="onChangePhone(data2.contractTelephone)"
                       formControlName="unloadPhone{{ idx }}" name="unloadAddress{{ idx }}" maxlength="11"
                       placeholder="请输入联系人电话" />
                   </nz-form-control>

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',
@@ -56,8 +54,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
     maxTrainNumber: 99999,
     maxFreight: 9999999
   };
+  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,
@@ -69,10 +67,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
     this.validateForm1 = fb.group({
       loadAddress0: [null, [Validators.required]],
       loadName0: [null, [Validators.required]],
-      loadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
+      loadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]],
       unloadAddress0: [null, [Validators.required]],
       unloadName0: [null, [Validators.required]],
-      unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]]
+      unloadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]]
     });
   }
   @ViewChild('sf1', { static: false }) sf1!: SFComponent;
@@ -1170,4 +1168,17 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
       }
     });
   }
+  onChangePhone(value: string): void {
+    console.log(value);
+    
+    this.updateValue(value);
+  }
+  updateValue(value: string): void {
+    const reg = /^-?(0|[1-9][0-9]*)(\.[0-9]*)?$/;
+    // if ((!isNaN(+value) && reg.test(value)) || value === '' || value === '-') {
+    //   this.value = value;
+    // }
+    // this.inputElement!.nativeElement.value = this.value;
+    // this.updateTitle();
+  }
 }

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

@@ -17,7 +17,7 @@
     <div class="card-title">装卸货信息<span class="tip-font">预计公里数：<em>{{ totalDistance }}km</em>，预计行程耗时：<em>{{ totalTime }}小时</em></span>
     </div>
 
-    <form #ngForm="ngForm" nz-form role="form">
+    <form #ngForm="ngForm" [formGroup]="validateForm1" nz-form role="form">
       <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="10">
           <div *ngFor="let data1 of startInfo; let idx = index">

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

@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { NgForm } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators, FormControl, NgForm } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import {
   SFComponent,
   SFSchema,
@@ -9,7 +9,6 @@ import {
   SFTextareaWidgetSchema,
   SFUISchema
 } from '@delon/form';
-import { SettingsService, _HttpClient } from '@delon/theme';
 import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { of } from 'rxjs';
@@ -20,7 +19,6 @@ import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-f
 import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component';
 import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.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',
@@ -28,7 +26,7 @@ import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.
   styleUrls: ['./bulk-release-publish.component.less']
 })
 export class SupplyManagementBulkReleasePublishComponent implements OnInit {
-  @ViewChild('ngForm')
+  validateForm1: FormGroup;
   ngForm!: NgForm;
   sf1data: any; // 货源单设置回显
   sf3data: any; // 货源单设置回显
@@ -50,6 +48,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
     maxFreight: 9999999
   }
   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}$`;
   // // 单位
   startInfo: any[] = [];
   endInfo: any[] = [];
@@ -57,16 +56,21 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
   totalTime = 0.0; //路程总时间
   freightTypeOptions: any;
   constructor(
-    private http: _HttpClient,
+    fb: FormBuilder,
     private modalService: NzModalService,
-    private settingSrv: SettingsService,
     private service: SupplyManagementService,
     private router: Router,
-    private route: ActivatedRoute,
     private amapService: AmapService,
     public shipperSrv: ShipperBaseService
   ) {
-    
+    this.validateForm1 = fb.group({
+      loadAddress0: [null, [Validators.required]],
+      loadName0: [null, [Validators.required]],
+      loadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]],
+      unloadAddress0: [null, [Validators.required]],
+      unloadName0: [null, [Validators.required]],
+      unloadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]]
+    });
   }
   @ViewChild('sf1', { static: false }) sf1!: SFComponent;
   schema1: SFSchema = {};

src/app/routes/supply-management/components/choose-famifiar/add/add.component.ts

@@ -1,9 +1,5 @@
-import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { SFComponent, SFSchema, SFSchemaEnumType, SFUISchema } from '@delon/form';
-import { _HttpClient } from '@delon/theme';
-import { NzModalRef } from 'ng-zorro-antd/modal';
-import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'app-choose-famifiar-add',
@@ -16,7 +12,7 @@ export class PublishchooseFamifiarAddComponent implements OnInit {
 
   i: any;
 
-  constructor(public http: _HttpClient, private cdr: ChangeDetectorRef, private route: ActivatedRoute) {}
+  constructor() {}
 
   ngOnInit(): void {
     this.initSF();

src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts

@@ -1,10 +1,8 @@
 import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper } from '@delon/theme';
 import { EAEnvironmentService } from '@shared';
-import { NzDrawerService } from 'ng-zorro-antd/drawer';
 import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 import { SupplyManagementAddDriversComponent } from 'src/app/routes/supply-management/components/add-drivers/add-drivers.component';
 import { SupplyManagementService } from '../../services/supply-management.service';
@@ -39,9 +37,6 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit {
 
   constructor(
     private modal: NzModalRef,
-    public router: Router,
-    public ar: ActivatedRoute,
-    private drawerService: NzDrawerService,
     public service: SupplyManagementService,
     private modalService: NzModalService,
     private modalHelper: ModalHelper,

src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts

@@ -8,12 +8,9 @@
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\choose-famifiar\\set-captain\\set-captain.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
-import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import {  Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { SFComponent, SFSchema, SFSchemaEnumType, SFUISchema } from '@delon/form';
-import { _HttpClient } from '@delon/theme';
 import { NzModalRef } from 'ng-zorro-antd/modal';
-import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'app-choose-famifiar-set-captain',
@@ -26,7 +23,7 @@ export class PublishchooseFamifiarSetCaptainComponent implements OnInit {
 
   i: any;
 
-  constructor(public http: _HttpClient, private cdr: ChangeDetectorRef, private route: ActivatedRoute, private modal: NzModalRef,) {}
+  constructor( private modal: NzModalRef,) {}
 
   ngOnInit(): void {
     this.initSF();

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

@@ -10,11 +10,8 @@
  */
 
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { processSingleSort } from '@shared';
-import { NzDrawerService } from 'ng-zorro-antd/drawer';
-import { NzModalService } from 'ng-zorro-antd/modal';
 import { SupplyManagementService } from '../../../services/supply-management.service';
 @Component({
   selector: 'app-publish-address-list',
@@ -30,11 +27,7 @@ export class PublishAddressListComponent implements OnInit {
   spuStatus = '1'; // '1'客户地址，'2'收回单地址
 
   constructor(
-    public router: Router,
-    public ar: ActivatedRoute,
-    private drawerService: NzDrawerService,
     public service: SupplyManagementService,
-    private modalService: NzModalService
   ) {}
 
   /**

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';
@@ -43,6 +41,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     intervalDays: 999,
     maxTimes: 5
   };
+  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}$`;
   sf1data: any; // 货源单设置回显
   sf3data: any; // 货源单设置回显
   sf4data: any; // 货源单设置回显
@@ -66,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,
@@ -78,7 +75,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
   ) {
     this.validateForm1 = fb.group({
       loadingTime: [null, [Validators.required]],
-      unloadingTime: [null, [Validators.required]]
+      unloadingTime: [null, [Validators.required]],
     });
     this.envCache = this.eaCacheSrv.get(cacheConf.env);
   }
@@ -806,7 +803,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       });
       this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
       this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
-      this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
+      this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required,  Validators.pattern(this.patternStr)]));
     }
   }
 
@@ -862,7 +859,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required));
       this.validateForm1.addControl(
         `unloadPhone${controlId}`,
-        new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])
+        new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)])
       );
     }
   }
@@ -1370,6 +1367,15 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     this.sf7.setValue('/toPay', this.sf7data.toPay);
     this.sf7.setValue('/receiptPay', this.sf7data.receiptPay);
     this.payChange();
+    // console.log('88888');
+    
+    // this.validateForm1.reset();
+    // for (const key in this.validateForm1.controls) {
+    //   if (this.validateForm1.controls.hasOwnProperty(key)) {
+    //     this.validateForm1.controls[key].markAsPristine();
+    //     this.validateForm1.controls[key].updateValueAndValidity();
+    //   }
+    // }
   }
 
   // 选择地址

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';
@@ -52,14 +49,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
   totalTime = 0.0; //路程总时间
   currentRate = 0; //实时计算的费率
   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
@@ -67,10 +61,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
     this.validateForm1 = fb.group({
       loadAddress0: [null, [Validators.required]],
       loadName0: [null, [Validators.required]],
-      loadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
+      loadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]],
       unloadAddress0: [null, [Validators.required]],
       unloadName0: [null, [Validators.required]],
-      unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
+      unloadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]],
       loadingTime: [null, [Validators.required]],
       unloadingTime: [null, [Validators.required]]
     });
@@ -609,7 +603,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
         receiptUserPhone: {
           type: 'string',
           title: '联系电话',
-          format: 'mobile',
           maxLength: 11,
           ui: {
             errors: {
@@ -836,7 +829,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       });
       this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
       this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
-      this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
+      this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)]));
     }
   }
   // 添加 删除发货卸货地址
@@ -865,7 +858,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required));
       this.validateForm1.addControl(
         `unloadPhone${controlId}`,
-        new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])
+        new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)])
       );
     }
   }

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,
+<<<<<<< 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/detail/detail.component.html

@@ -48,30 +48,31 @@
               保存
             </button>
             <button [disabled]="false" nz-button nzDanger (click)="auditPass(true)"
-              *ngIf="detailData?.approvalStatus===10" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass']">
+              *ngIf="detailData?.approvalStatus===10" acl
+              [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass','USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
               通过
             </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-LIST-DETAIL-pass']">
+                [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass','USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
                 通过
               </button>
               <button [disabled]="false" nz-button nzDanger (click)="auditNo()" acl
-                [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass']">
+                [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-pass','USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
                 驳回
               </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-LIST-DETAIL-lock']">
+                acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock','USERCENTER-FREIGHT-ENTERPRISE-D-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-LIST-DETAIL-lock']">
+                acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock','USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 冻结
               </button>
               <button [disabled]="false" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payfrozen"
@@ -84,7 +85,7 @@
               </button>
             </ng-container>
             <button [disabled]="false" nz-button nzDanger (click)="ratify()" acl
-              [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-save']">
+              [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-save','USERCENTER-FREIGHT-ENTERPRISE-D-save']">
               修改
             </button>
           </ng-template>

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/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
   ) {