From 5206b4a0c273db09576f6e0f93fc43b02c2d022b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 17:23:01 +0800 Subject: [PATCH 01/18] fix bug --- .../voucher-summary.component.html | 13 ++++++++++++- .../bulk-publish/bulk-publish.component.html | 4 ++-- .../bulk-publish/bulk-publish.component.ts | 18 ++++++++++++++++-- .../bulk-release-publish.component.html | 2 +- .../bulk-release-publish.component.ts | 15 ++++++++++++--- .../onecar-publish/onecar-publish.component.ts | 16 +++++++++++++--- .../release-publish.component.ts | 10 +++++----- 7 files changed, 61 insertions(+), 17 deletions(-) diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html index 7380f466..4e14b673 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html @@ -1,3 +1,13 @@ + @@ -50,11 +50,11 @@ --> - + - {{ item.hrmoney | currency }} + {{ item.armoeny ? (item.armoeny| currency ): '--' }} / {{ item.hrmoney? (item.hrmoney | currency) : '--'}} {{ item.cnoCode }}/{{ item.cnoName }} diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index 7c913644..3a064c06 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/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' }, From a7b0dd6b78dc6367200e3a80775f312c308fd58e Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Sat, 7 May 2022 17:47:06 +0800 Subject: [PATCH 03/18] edit --- .../components/receivable-order/receivable-order.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html index ceb5e6f5..8482c148 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html @@ -48,6 +48,7 @@
+
From b4d35f136919bd9c1604839c03748870c526c66b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 17:57:13 +0800 Subject: [PATCH 04/18] fix bug --- proxy.conf.js | 4 ++-- .../contract-frame/contract-frame.component.html | 3 ++- .../contract-list/contract-list.component.html | 6 +++--- .../contract-partner.component.html | 5 +++-- .../components/edit/edit.component.ts | 16 ++++++++++++++-- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 2fe9e131..3332d717 100644 --- a/proxy.conf.js +++ b/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-07 17:54:06 * @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 }, diff --git a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html index 37e24dfb..276a8231 100644 --- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html +++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html @@ -80,7 +80,8 @@ (change)="stChange($event)" > - {{ item?.contractCode }} + {{ item?.contractCode }} + {{ item?.contractCode }} diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.html b/src/app/routes/contract-management/components/contract-list/contract-list.component.html index 0876e5cf..709cfb87 100644 --- a/src/app/routes/contract-management/components/contract-list/contract-list.component.html +++ b/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 @@ - {{ item?.contractCode }} - + {{ item?.contractCode }} + {{ item?.contractCode }} diff --git a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html index 4b5e20cd..d61d5e4d 100644 --- a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html +++ b/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)" > - {{ item?.contractCode }} + {{ item?.contractCode }} + {{ item?.contractCode }} diff --git a/src/app/routes/partner/level-config/components/edit/edit.component.ts b/src/app/routes/partner/level-config/components/edit/edit.component.ts index 0eeda78c..dd9725f1 100644 --- a/src/app/routes/partner/level-config/components/edit/edit.component.ts +++ b/src/app/routes/partner/level-config/components/edit/edit.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-28 20:27:22 + * @LastEditors : Shiming + * @LastEditTime : 2022-05-07 17:50:23 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\level-config\\components\\edit\\edit.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; @@ -39,12 +49,14 @@ export class ParterLevelConfigEditComponent implements OnInit { ui: { hidden: true } }, gradeName: { - title: '等级名称', + title: '等级名称444', type: 'string', + maxLength: 12 }, sortId: { title: '排序', - type: 'string', + minimum: 0, + type:"number", }, remark: { type: 'string', From 644152472df009f9989f058ee6fd3e0a4aa59335 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Sat, 7 May 2022 17:57:54 +0800 Subject: [PATCH 05/18] edit --- .../components/refund-record/refund-record.component.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts index 8682457c..6a190102 100644 --- a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts +++ b/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: '所属项目', From 94cef10a15c7bae0693d4552a74bb02457a89773 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 18:00:06 +0800 Subject: [PATCH 06/18] fix bug --- .../partner/level-config/components/edit/edit.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/partner/level-config/components/edit/edit.component.ts b/src/app/routes/partner/level-config/components/edit/edit.component.ts index dd9725f1..cfd10172 100644 --- a/src/app/routes/partner/level-config/components/edit/edit.component.ts +++ b/src/app/routes/partner/level-config/components/edit/edit.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-28 20:27:22 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 17:50:23 + * @LastEditTime : 2022-05-07 18:00:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\level-config\\components\\edit\\edit.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -49,7 +49,7 @@ export class ParterLevelConfigEditComponent implements OnInit { ui: { hidden: true } }, gradeName: { - title: '等级名称444', + title: '等级名称', type: 'string', maxLength: 12 }, From af935f544b2d26cf448ad701746e67dafa3c24e0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 18:05:13 +0800 Subject: [PATCH 07/18] fix bug --- .../partner/level-config/components/edit/edit.component.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/routes/partner/level-config/components/edit/edit.component.ts b/src/app/routes/partner/level-config/components/edit/edit.component.ts index cfd10172..2903480e 100644 --- a/src/app/routes/partner/level-config/components/edit/edit.component.ts +++ b/src/app/routes/partner/level-config/components/edit/edit.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-28 20:27:22 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 18:00:01 + * @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. */ @@ -57,6 +57,11 @@ export class ParterLevelConfigEditComponent implements OnInit { title: '排序', minimum: 0, type:"number", + ui: { + change: (item: any) => { + this.sf.setValue('/sortId', item?.toFixed(0)) + } + } }, remark: { type: 'string', From de6c048f2efeba5cd17664a40ccd6409bf02d4c0 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 9 May 2022 09:44:44 +0800 Subject: [PATCH 08/18] edit --- .../components/payment-order/payment-order.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 23a987d2..95a07b50 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/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 }, { From 5b36842c5d5a2a3c2463bc783ea551e4e22b0f5c Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 9 May 2022 09:47:04 +0800 Subject: [PATCH 09/18] edit --- src/app/routes/commom/less/commom-table.less | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/routes/commom/less/commom-table.less b/src/app/routes/commom/less/commom-table.less index 43fa7d95..ec058484 100644 --- a/src/app/routes/commom/less/commom-table.less +++ b/src/app/routes/commom/less/commom-table.less @@ -113,9 +113,10 @@ line-height: 21px; } - // .text-truncate { - // white-space: normal; - // } + .text-truncate { + white-space: normal; + } + // 强制头部居中 .ant-table-container table>thead>tr>.options { text-align: center !important; From 1f462ebdfea805c3438fb5ce51a9e14f94b1c44b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 9 May 2022 10:39:39 +0800 Subject: [PATCH 10/18] edit --- proxy.conf.js | 2 +- .../edit-password/edit-password.component.ts | 75 +++++----- .../components/list/list.component.ts | 6 +- .../components/set/set.component.ts | 14 +- .../components/set/set.component.ts | 19 +-- .../bulk-detail-change.component.ts | 1 - .../bulk-detail/bulk-detail.component.ts | 1 - .../complaint-detail.component.ts | 2 - .../vehicle-detail-change.component.ts | 3 +- .../components/vehicle/vehicle.component.ts | 1 - .../components/list/list.component.ts | 59 ++++---- .../components/edit/edit.component.ts | 64 ++++---- .../components/list/list.component.ts | 58 +++----- .../components/list/list.component.ts | 6 +- .../channel-approve.component.ts | 42 ++---- .../channel-detail.component.ts | 6 - .../channel-reject.component.ts | 42 ++---- .../components/list/list.component.ts | 61 ++++---- .../partner-approve.component.ts | 41 ++---- .../partner-detail.component.ts | 26 +--- .../partner-reject.component.ts | 42 ++---- .../banner/components/list/list.component.ts | 56 +++---- .../components/edit/edit.component.ts | 13 +- .../components/list/list.component.ts | 4 - .../channel-log-modal.component.ts | 3 +- .../particulars/particulars.component.ts | 9 +- .../rebate-record/rebate-record.component.ts | 4 - .../rebate-setting.component.ts | 139 +++++++++--------- .../abnormal-feedback.component.ts | 33 ++--- .../record-detail/record-detail.component.ts | 58 +++----- .../components/detail/detail.component.ts | 1 - .../components/addmodal/addmodal.component.ts | 3 +- .../bulk-release-publish.component.ts | 7 +- .../choose-famifiar/add/add.component.ts | 10 +- .../choose-famifiar.component.ts | 5 - .../set-captain/set-captain.component.ts | 9 +- .../address-list/address-list.component.ts | 7 - .../freight/list/detail/detail.component.html | 15 +- 38 files changed, 367 insertions(+), 580 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 3332d717..057e4e2c 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/account/components/edit-password/edit-password.component.ts b/src/app/routes/account/components/edit-password/edit-password.component.ts index 3f4cd9b7..4410cfa0 100644 --- a/src/app/routes/account/components/edit-password/edit-password.component.ts +++ b/src/app/routes/account/components/edit-password/edit-password.component.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2021-12-27 10:30:56 @@ -9,14 +9,11 @@ * Copyright (C) 2022 huzhenhong. All rights reserved. */ -import { Component, Inject, OnInit, ViewChild } from '@angular/core'; -import { FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'; -import { ActivatedRoute, Router } from '@angular/router'; -import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; +import { Component, Inject, OnInit } from '@angular/core'; +import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; +import { Router } from '@angular/router'; 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 = - (control: FormControl): { [s: string]: boolean } => { + confirmationValidator = (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 () { - this.validateForm = this.fb.group({ - 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]], - }); -} + initForm() { + this.validateForm = this.fb.group({ + 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]] + }); + } 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) { - this.service.msgSrv.warning('必填项为空或格式错误，请检查！') + if (!this.validateForm.valid) { + this.service.msgSrv.warning('必填项为空或格式错误，请检查！'); return; } - const params = { + 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.modalRef.close() - }, 3000) + this.router.navigate(['/passport/login']); + this.modalRef.close(); + }, 3000); } }); } @@ -120,11 +117,11 @@ export class AccountComponentsCenterEditComponent implements OnInit { }, 1000); } handleCancel() { - this.isVisibleView = false - } - handleOK() { - this.modalRef.close() - this.tokenService.clear(); - this.router.navigate(['/passport/login']) - } + this.isVisibleView = false; + } + handleOK() { + this.modalRef.close(); + this.tokenService.clear(); + this.router.navigate(['/passport/login']); + } } diff --git a/src/app/routes/download/components/list/list.component.ts b/src/app/routes/download/components/list/list.component.ts index 05f38c4c..efdbd8d2 100644 --- a/src/app/routes/download/components/list/list.component.ts +++ b/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 { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; +import { 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) {} /** * 查询参数 diff --git a/src/app/routes/insurance-management/components/set/set.component.ts b/src/app/routes/insurance-management/components/set/set.component.ts index 7e1055a0..0180f497 100644 --- a/src/app/routes/insurance-management/components/set/set.component.ts +++ b/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( - private route: ActivatedRoute, - private msgSrv: NzMessageService, - private service: InsuranceManagementService, - ) { + constructor() { } diff --git a/src/app/routes/interface-docking/components/set/set.component.ts b/src/app/routes/interface-docking/components/set/set.component.ts index 5d1dd8ab..81954b73 100644 --- a/src/app/routes/interface-docking/components/set/set.component.ts +++ b/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( - private route: ActivatedRoute, - private msgSrv: NzMessageService, - private service: InterfaceDockingService, - ) { - - } + constructor() {} ngOnInit(): void { - this.initData() - } - initData() { - + this.initData(); } + initData() {} goBack() { window.history.go(-1); } - } diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index e0a0057f..bae533bc 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/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, []], diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 98957f4b..f5ad8d4e 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/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(); } diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts index 19ee68de..e27e0bf6 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts +++ b/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() } diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index ee919886..0a6ecd72 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/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); } diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 72ca5609..65438393 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/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); diff --git a/src/app/routes/partner/advice-feedback/components/list/list.component.ts b/src/app/routes/partner/advice-feedback/components/list/list.component.ts index 80260b01..206f978e 100644 --- a/src/app/routes/partner/advice-feedback/components/list/list.component.ts +++ b/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({ @@ -20,15 +18,10 @@ export class ParterAdviceFeedbackListComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; _$expand = false; - selectedIndex = 0; + selectedIndex = 0; - data=[{name1:1111}] - constructor( - public router: Router, - public ar: ActivatedRoute, - public service: AdviceFeedbackService, - private modalService: NzModalService - ) {} + data = [{ name1: 1111 }]; + constructor(public router: Router, public service: AdviceFeedbackService) {} /** * 查询参数 @@ -36,19 +29,19 @@ export class ParterAdviceFeedbackListComponent implements OnInit { get reqParams() { return { ...this.sf?.value }; } - /** + /** * 查询字段个数 */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } ngOnInit() { this.initSF(); @@ -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) + } ] } ]; @@ -197,7 +189,7 @@ export class ParterAdviceFeedbackListComponent implements OnInit { partnerView(record: STData) { this.router.navigate(['/partner/advice-feedback/detail'], { queryParams: {} }); } - + channelView(record: STData) { this.router.navigate(['/partner/advice-feedback/detail'], { queryParams: {} }); } @@ -211,8 +203,8 @@ export class ParterAdviceFeedbackListComponent implements OnInit { // this.st1?.load(1); } - tabChange(index:any){ - console.log(index) + tabChange(index: any) { + console.log(index); switch (index) { case 0: this.initST1(); @@ -224,5 +216,4 @@ export class ParterAdviceFeedbackListComponent implements OnInit { break; } } - } diff --git a/src/app/routes/partner/article-management/components/edit/edit.component.ts b/src/app/routes/partner/article-management/components/edit/edit.component.ts index 8389e378..c81fcff1 100644 --- a/src/app/routes/partner/article-management/components/edit/edit.component.ts +++ b/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 { ActivatedRoute } from '@angular/router'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { apiConf } from '@conf/api.conf'; -import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; +import { + 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( - public http: _HttpClient, - private cdr: ChangeDetectorRef, - private route: ActivatedRoute, - public service: ChannelSalesService, - ) {} + constructor(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字符' - } as SFTextareaWidgetSchema, + placeholder: '请输入50字符' + } as SFTextareaWidgetSchema }, name2: { type: 'string', @@ -54,8 +53,8 @@ export class ParterArticleManagementEditComponent implements OnInit { ui: { widget: 'textarea', autosize: { minRows: 3, maxRows: 6 }, - placeholder:'请输入50字符' - } as SFTextareaWidgetSchema, + placeholder: '请输入50字符' + } as SFTextareaWidgetSchema }, name3: { type: 'string', @@ -89,12 +88,10 @@ export class ParterArticleManagementEditComponent implements OnInit { name: { title: '分类', type: 'string', - enum: [ - { label: '管理员', value: '1'}, - ], + enum: [{ label: '管理员', value: '1' }], ui: { - widget: 'select', - } as SFSelectWidgetSchema, + widget: 'select' + } as SFSelectWidgetSchema }, name4: { type: 'number', @@ -102,21 +99,21 @@ export class ParterArticleManagementEditComponent implements OnInit { minimum: 0, maximum: 99, ui: { - widgetWidth: 300 , - placeholder:'请输入0~99，数字越大，排序越靠前' + widgetWidth: 300, + placeholder: '请输入0~99，数字越大，排序越靠前' } }, name5: { type: 'string', title: '跳转路径', enum: [ - { label: '图文', value: '1'}, - { label: '视频', value: '2'}, + { label: '图文', value: '1' }, + { 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); diff --git a/src/app/routes/partner/article-management/components/list/list.component.ts b/src/app/routes/partner/article-management/components/list/list.component.ts index 89835f98..fdaff281 100644 --- a/src/app/routes/partner/article-management/components/list/list.component.ts +++ b/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}] - constructor( - public router: Router, - public ar: ActivatedRoute, - public service: ChannelSalesService, - private modalService: NzModalService - ) {} + data = [{ name1: 1111 }]; + constructor(public router: Router, public service: ChannelSalesService, private modalService: NzModalService) {} /** * 查询参数 @@ -40,7 +33,7 @@ export class ParterArticleManagementListComponent implements OnInit { /** * 重置表单 */ - resetSF() { + resetSF() { this.sf.reset(); this.st.load(1); } @@ -49,19 +42,19 @@ export class ParterArticleManagementListComponent implements OnInit { // this.st1?.load(1); } - /** + /** * 查询字段个数 */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } ngOnInit() { this.initSF(); this.initST(); @@ -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: '禁用确认', - nzContent: `确定禁用此文章吗？
`, + nzContent: `确定禁用此文章吗？
` // nzOnOk: () => // this.service.request('', '').subscribe(res => { // if (res) { @@ -183,7 +174,7 @@ export class ParterArticleManagementListComponent implements OnInit { start(record: STData) { this.modalService.confirm({ nzTitle: '启用确认', - nzContent: `确定启用此文章吗？
`, + nzContent: `确定启用此文章吗？
` // nzOnOk: () => // this.service.request('', '').subscribe(res => { // if (res) { @@ -193,8 +184,5 @@ export class ParterArticleManagementListComponent implements OnInit { // }) }); } - recommend(record: STData) { - - } - + recommend(record: STData) {} } diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.ts b/src/app/routes/partner/channel-sales/components/list/list.component.ts index 8c971305..1939905f 100644 --- a/src/app/routes/partner/channel-sales/components/list/list.component.ts +++ b/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 { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; +import { Router } from '@angular/router'; +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 ) { } diff --git a/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts b/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts index 276c2a43..46fced85 100644 --- a/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts +++ b/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 { ActivatedRoute } from '@angular/router'; -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 { map } from 'rxjs/operators'; -import { AmapPoiPickerComponent } from 'src/app/shared/components/amap'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; +import { NzModalRef } from 'ng-zorro-antd/modal'; 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( - public http: _HttpClient, - private cdr: ChangeDetectorRef, - private route: ActivatedRoute, - private modalService: NzModalService, - public service: ClaimAuditService, - private modalRef: NzModalRef - ) {} + constructor(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个字' - } as SFTextareaWidgetSchema, - }, + placeholder: '请不要超过50个字' + } 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 { // } // }); } - - } diff --git a/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.ts b/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.ts index c3eca870..f44b9cee 100644 --- a/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.ts +++ b/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 { diff --git a/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts b/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts index 0f419064..47623783 100644 --- a/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts +++ b/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 { ActivatedRoute } from '@angular/router'; -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 { map } from 'rxjs/operators'; -import { AmapPoiPickerComponent } from 'src/app/shared/components/amap'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; +import { NzModalRef } from 'ng-zorro-antd/modal'; 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( - public http: _HttpClient, - private cdr: ChangeDetectorRef, - private route: ActivatedRoute, - private modalService: NzModalService, - public service: ClaimAuditService, - private modalRef: NzModalRef - ) {} + constructor(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个字' - } as SFTextareaWidgetSchema, - }, + placeholder: '请不要超过50个字' + } 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 { // } // }); } - - } diff --git a/src/app/routes/partner/claim-audit/components/list/list.component.ts b/src/app/routes/partner/claim-audit/components/list/list.component.ts index cf817568..2008b77a 100644 --- a/src/app/routes/partner/claim-audit/components/list/list.component.ts +++ b/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 { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; +import { Router } from '@angular/router'; +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({ @@ -22,15 +20,10 @@ export class ParterClaimAuditListComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; _$expand = false; - selectedIndex = 0; + selectedIndex = 0; - data=[{name1:1111}] - constructor( - public router: Router, - public ar: ActivatedRoute, - public service: ClaimAuditService, - private modalService: NzModalService - ) {} + data = [{ name1: 1111 }]; + constructor(public router: Router, public service: ClaimAuditService) {} /** * 查询参数 @@ -38,19 +31,19 @@ export class ParterClaimAuditListComponent implements OnInit { get reqParams() { return { ...this.sf?.value }; } - /** + /** * 查询字段个数 */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } ngOnInit() { this.initSF(); @@ -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) + } ] } ]; @@ -199,7 +191,7 @@ export class ParterClaimAuditListComponent implements OnInit { partnerView(record: STData) { this.router.navigate(['/partner/claim-audit/partner-detail'], { queryParams: {} }); } - + channelView(record: STData) { this.router.navigate(['/partner/claim-audit/channel-detail'], { queryParams: {} }); } @@ -213,8 +205,8 @@ export class ParterClaimAuditListComponent implements OnInit { // this.st1?.load(1); } - tabChange(index:any){ - console.log(index) + tabChange(index: any) { + console.log(index); switch (index) { case 0: this.initST1(); @@ -226,5 +218,4 @@ export class ParterClaimAuditListComponent implements OnInit { break; } } - } diff --git a/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts b/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts index 0bab6b02..48e90820 100644 --- a/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts +++ b/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 { ActivatedRoute } from '@angular/router'; -import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; +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 { map } from 'rxjs/operators'; -import { AmapPoiPickerComponent } from 'src/app/shared/components/amap'; +import { NzModalRef } from 'ng-zorro-antd/modal'; 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( - public http: _HttpClient, - private cdr: ChangeDetectorRef, - private route: ActivatedRoute, - private modalService: NzModalService, - public service: ClaimAuditService, - private modalRef: NzModalRef - ) {} + constructor(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个字' - } as SFTextareaWidgetSchema, - }, + placeholder: '请不要超过50个字' + } 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 { // } // }); } - - } diff --git a/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.ts index 41f5558f..45b1d112 100644 --- a/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.ts +++ b/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.ts @@ -1,15 +1,9 @@ - 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'; +import { ParterClaimAuditListPartnerApproveComponent } from '../partner-approve/partner-approve.component'; @Component({ selector: 'app-parter-claim-audit-partner-detail', @@ -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( - private route: ActivatedRoute, - private msgSrv: NzMessageService, - private service: ClaimAuditService, - private modalService: NzModalService, - private router: Router - ) {} + constructor(private route: ActivatedRoute, private modalService: NzModalService) {} ngOnInit(): void { this.initData(); @@ -47,7 +35,7 @@ export class ParterClaimAuditListPartnerDetailComponent implements OnInit { // this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => { // if (res) { // this.i = res; - // + // // } // }); } @@ -77,6 +65,4 @@ export class ParterClaimAuditListPartnerDetailComponent implements OnInit { goBack() { window.history.go(-1); } - - } diff --git a/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts b/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts index 0b1419bf..8c12a4e8 100644 --- a/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts +++ b/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 { ActivatedRoute } from '@angular/router'; -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 { map } from 'rxjs/operators'; -import { AmapPoiPickerComponent } from 'src/app/shared/components/amap'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; +import { NzModalRef } from 'ng-zorro-antd/modal'; 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( - public http: _HttpClient, - private cdr: ChangeDetectorRef, - private route: ActivatedRoute, - private modalService: NzModalService, - public service: ClaimAuditService, - private modalRef: NzModalRef - ) {} + constructor(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个字' - } as SFTextareaWidgetSchema, - }, + placeholder: '请不要超过50个字' + } 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 { // } // }); } - - } diff --git a/src/app/routes/partner/knowledge/banner/components/list/list.component.ts b/src/app/routes/partner/knowledge/banner/components/list/list.component.ts index 8728b5a8..ac80a8bc 100644 --- a/src/app/routes/partner/knowledge/banner/components/list/list.component.ts +++ b/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 } + } }; } @@ -138,9 +144,9 @@ export class BannerComponentsListComponent implements OnInit { index: 'style', className: 'text-center', type: 'enum', - 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; } /** diff --git a/src/app/routes/partner/level-config/components/edit/edit.component.ts b/src/app/routes/partner/level-config/components/edit/edit.component.ts index 2903480e..8d76477a 100644 --- a/src/app/routes/partner/level-config/components/edit/edit.component.ts +++ b/src/app/routes/partner/level-config/components/edit/edit.component.ts @@ -8,13 +8,10 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\level-config\\components\\edit\\edit.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ -import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; +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 { map } from 'rxjs/operators'; -import { AmapPoiPickerComponent } from 'src/app/shared/components/amap'; +import { NzModalRef } from 'ng-zorro-antd/modal'; import { ChannelSalesService } from '../../services/level-config.service'; @Component({ @@ -29,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 ) {} diff --git a/src/app/routes/partner/level-config/components/list/list.component.ts b/src/app/routes/partner/level-config/components/list/list.component.ts index 12b39be1..e1ac2ab0 100644 --- a/src/app/routes/partner/level-config/components/list/list.component.ts +++ b/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 ) {} diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts index 6fc1e963..3f838c47 100644 --- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts +++ b/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 {} diff --git a/src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts index 28bc88df..19925ba7 100644 --- a/src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts +++ b/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, STData, STRequestOptions } from '@delon/abc/st'; +import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; -import { processSingleSort, ShipperBaseService } from '@shared'; -import { NzModalService } from 'ng-zorro-antd/modal'; +import { ShipperBaseService } from '@shared'; 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 ) {} /** diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts index 7426e912..74ab1f6f 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts +++ b/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, diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts index e769e5da..36035584 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts +++ b/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 { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; -import { processSingleSort, ShipperBaseService } from '@shared'; +import { Router } from '@angular/router'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; +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,19 +23,18 @@ 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 ) {} /** - * 查询参数 - */ - get reqParams() { + * 查询参数 + */ + get reqParams() { const params: any = Object.assign({}, this.sf?.value || {}); - return { - ...params, - }; + return { + ...params + }; } ngOnInit() { this.initSF(); @@ -49,21 +46,20 @@ export class ParterRebateManageMentSettingComponent implements OnInit { properties: { configName: { type: 'string', - title: '模板名称', + title: '模板名称' }, stateLocked: { type: 'string', title: '状态', enum: [ - {label: '全部', value: ''}, - {label: '生效中', value: 1}, - {label: '失效', value: 0}, + { label: '全部', value: '' }, + { label: '生效中', value: 1 }, + { 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)}, - click: _record => this.viewEvaluate(_record), + iif: _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}, - click: _record => this.viewEvaluate(_record), - }, + iif: _record => { + return _record.stateLocked == false; + }, + click: _record => this.viewEvaluate(_record) + } ] } ]; @@ -147,52 +146,52 @@ export class ParterRebateManageMentSettingComponent implements OnInit { /** *禁用 */ - viewEvaluate(item: any) { - console.log(item.stateLocked); - let title = '' - let stateLocked: boolean; - if(item.stateLocked) { - title = '是否禁用该配置？' - stateLocked = false - } else { - title = '是否启用该配置？' - stateLocked = true - } + viewEvaluate(item: any) { + console.log(item.stateLocked); + let title = ''; + let stateLocked: boolean; + if (item.stateLocked) { + title = '是否禁用该配置？'; + stateLocked = false; + } else { + title = '是否启用该配置？'; + stateLocked = true; + } this.modal.confirm({ nzTitle: title, nzOnOk: () => { const params = { id: item?.id, - stateLocked: stateLocked, - } - this.service.request(this.service.$api_set_updateRebateConfig,params).subscribe((res: any) => { - if(res) { - this.service.msgSrv.success('设置成功！') - this.st.reload(); - } - }) + stateLocked: stateLocked + }; + this.service.request(this.service.$api_set_updateRebateConfig, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('设置成功！'); + this.st.reload(); + } + }); } }); } /** *查看 */ - feedback(item?: any) { - const modal = this.modal.create({ - nzTitle: '查看', - nzWidth: 580, - nzContent: ParterRebateManageMenAbnormalFeedbackComponent, - nzComponentParams: { i: item }, - nzFooter: null - }); - modal.afterClose.subscribe((res: any) => { - if (res) { - } - }); + feedback(item?: any) { + const modal = this.modal.create({ + nzTitle: '查看', + nzWidth: 580, + nzContent: ParterRebateManageMenAbnormalFeedbackComponent, + nzComponentParams: { i: item }, + nzFooter: null + }); + modal.afterClose.subscribe((res: any) => { + if (res) { + } + }); } configAction(value?: any) { - this.router.navigate(['/partner/rebate/setting/add/', '0'], {queryParams: value}) - } + this.router.navigate(['/partner/rebate/setting/add/', '0'], { queryParams: value }); + } /** * 重置表单 */ diff --git a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts index 3d8c1fd4..4c4f36d9 100644 --- a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts +++ b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-03-10 14:50:45 @@ -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 { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; -import { processSingleSort, ShipperBaseService } from '@shared'; -import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal'; +import { SFComponent, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; +import { 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( - public router: Router, - public ar: ActivatedRoute, - public service: RebateManagementService, - private modalService: NzModalService, - public shipperservice: ShipperBaseService, - public modalRef: NzModalRef, - ) {} - + constructor(public service: RebateManagementService, 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个字' - } as SFTextareaWidgetSchema, - }, + placeholder: '请不要超过50个字' + } as SFTextareaWidgetSchema + } } }; this.ui = { '*': { spanLabelFixed: 60, - grid: { span: 16 }, + grid: { span: 16 } } }; } close() { - this.modalRef.destroy() + this.modalRef.destroy(); } } - diff --git a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts index 1efde6a2..2af7dbcf 100644 --- a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts +++ b/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, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { processSingleSort, ShipperBaseService } from '@shared'; -import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; +import { NzModalRef } from 'ng-zorro-antd/modal'; import { RebateManagementService } from '../../services/rebate-management.service'; import { NzButtonSize } from 'ng-zorro-antd/button'; @@ -24,36 +22,29 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit { size: NzButtonSize = 'large'; _$expand = false; data = [{ name1: 1111 }]; - constructor( - public router: Router, - public ar: ActivatedRoute, - public service: RebateManagementService, - private modalService: NzModalService, - public shipperservice: ShipperBaseService, - public modalRef: NzModalRef, - ) {} + constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {} /** * 查询字段个数 */ get queryFieldCount(): number { return Object.keys(this.schema?.properties || {}).length; } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } /** - * 查询参数 - */ - get reqParams() { + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + /** + * 查询参数 + */ + get reqParams() { const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; - return { - ...params, - }; + return { + ...params + }; } ngOnInit() { this.initSF(); @@ -72,8 +63,8 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit { allowClear: true, asyncData: () => this.shipperservice.getNetworkFreightForwarder(), change: (value: any) => { - console.log(value) - this.st.reload() + console.log(value); + 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) - this.st.reload() + console.log(value); + 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(); } } - diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts index bbfad88e..08d5e9bc 100644 --- a/src/app/routes/partner/recorded/components/detail/detail.component.ts +++ b/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'; diff --git a/src/app/routes/supply-management/components/addmodal/addmodal.component.ts b/src/app/routes/supply-management/components/addmodal/addmodal.component.ts index 7497b56a..e157fc0a 100644 --- a/src/app/routes/supply-management/components/addmodal/addmodal.component.ts +++ b/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 ) { } diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 813e45bd..18ebcb55 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/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 { 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', @@ -58,13 +56,10 @@ 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 ) { diff --git a/src/app/routes/supply-management/components/choose-famifiar/add/add.component.ts b/src/app/routes/supply-management/components/choose-famifiar/add/add.component.ts index 383d919d..ed4315a7 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/add/add.component.ts +++ b/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 { ActivatedRoute } from '@angular/router'; -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'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; @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(); diff --git a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts index 3b5ada90..4486fca5 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts +++ b/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, diff --git a/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts b/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts index 67562dea..e618d25a 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts +++ b/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 { ActivatedRoute } from '@angular/router'; -import { SFComponent, SFSchema, SFSchemaEnumType, SFUISchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; 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(); diff --git a/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.ts b/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.ts index 9dcc4ec0..c8def574 100644 --- a/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.ts +++ b/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 ) {} /** diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index befa6692..5e4d39ca 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -48,30 +48,31 @@ 保存 @@ -557,4 +558,4 @@ - + \ No newline at end of file From e4d30233589e5aa04451f9fcc564b472d498de3a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 10:48:37 +0800 Subject: [PATCH 11/18] fix bug --- .../withdrawals-record/withdrawals-record.component.ts | 6 ++++-- .../withdrawals-record/withdrawals-record.component.ts | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 8491ea1d..68c2c5c8 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/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; }; @@ -84,7 +86,7 @@ export class WithdrawalsRecordComponent extends BasicTableComponent { params = [item.id]; } else { console.log(this.selectedRows); - + if (this.selectedRows.length <= 0) { this.service.msgSrv.error('请选择提现单！'); return; diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 4b48ec35..22e65c7f 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/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) => { From 3aef27290daf86e2b67fae289288e75d5592c2e6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 10:49:26 +0800 Subject: [PATCH 12/18] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index afdba959..d8652768 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -46,12 +46,12 @@
  • 新增企业
    • -
  • + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 020eb8c4..8ec7d565 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -469,14 +469,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服
    ', click: item => this.showService(item) }, - { - text: '修改合伙人', - click: item => this.editPartner(item) - }, - { - text: '修改渠道销售', - click: item => this.editSale(item) - } + // { + // text: '修改合伙人', + // click: item => this.editPartner(item) + // }, + // { + // text: '修改渠道销售', + // click: item => this.editSale(item) + // } ] } ]; From 57dfb24ff6457f198c063e134ba392df12b13e8a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 10:50:04 +0800 Subject: [PATCH 13/18] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index d8652768..afdba959 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -46,12 +46,12 @@
  • 新增企业
    • - + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 8ec7d565..020eb8c4 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -469,14 +469,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服
    ', click: item => this.showService(item) }, - // { - // text: '修改合伙人', - // click: item => this.editPartner(item) - // }, - // { - // text: '修改渠道销售', - // click: item => this.editSale(item) - // } + { + text: '修改合伙人', + click: item => this.editPartner(item) + }, + { + text: '修改渠道销售', + click: item => this.editSale(item) + } ] } ]; From c36d7f442ce217fdfc7c6bb1f6f5d11bdf89e4a2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 11:05:31 +0800 Subject: [PATCH 14/18] fix bug --- .../withdrawals-record/withdrawals-record.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 22e65c7f..f7320059 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -48,7 +48,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni afterRes = (data: any[], rawData?: any) => { data = data.map(node => ({ ...node, - // disabled: node.refundStatus !== '1' + disabled: node.refundStatus !== '1' })); return data; }; From d971d09d1234cacb932d88c239a129494e52af34 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 9 May 2022 11:23:33 +0800 Subject: [PATCH 15/18] reuse --- .../bulk-publish/bulk-publish.component.ts | 3 - .../onecar-publish.component.ts | 6 +- .../release-publish.component.ts | 7 -- .../components/vehicle/vehicle.component.ts | 3 - .../note-management.component.ts | 8 +- .../billing-order/billing-order.component.ts | 5 +- .../driver/captain/captain.component.ts | 10 +-- .../driver-config/driver-config.component.ts | 1 - .../enterprise-audit.component.ts | 2 +- .../freight-config.component.ts | 1 - .../list/editPartner/editPartner.component.ts | 73 ++++++++---------- .../list/editSale/editSale.component.ts | 76 ++++++++----------- .../freight/list/new/new.component.ts | 2 +- .../freight/list/view/view.component.ts | 9 +-- .../list/detail/detail.component.ts | 7 +- .../bulk-detail/bulk-detail.component.ts | 4 - .../vehicle-detail.component.ts | 4 - .../shared/services/business/user.service.ts | 4 +- 18 files changed, 75 insertions(+), 150 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index a7ff5c1a..b9ce6987 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -10,7 +10,6 @@ import { SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; import { AmapPoiPickerComponent, AmapService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-famifiar.component'; @@ -20,7 +19,6 @@ import { of } from 'rxjs'; import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component'; import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component'; import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component'; -import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component'; @Component({ selector: 'app-publish-goods-bulk-publish', @@ -58,7 +56,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }; patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`; constructor( - private http: _HttpClient, fb: FormBuilder, private router: Router, private route: ActivatedRoute, diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 06631777..354ed480 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -3,9 +3,8 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; import format from 'date-fns/format'; import { Subject } from 'rxjs'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { - SFCheckboxWidgetSchema, SFComponent, SFNumberWidgetSchema, SFSchema, @@ -14,7 +13,6 @@ import { SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; import { AmapPoiPickerComponent, AmapService, EACacheService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; @@ -67,9 +65,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { envCache: any; enterpriseProjectIds: any; constructor( - private http: _HttpClient, fb: FormBuilder, - private router: Router, private route: ActivatedRoute, private modalService: NzModalService, public service: SupplyManagementService, diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index d9ae116f..6fd3cd8e 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -1,10 +1,8 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { ActivatedRoute, Router } from '@angular/router'; import { cacheConf } from '@conf/cache.conf'; import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; import { - SFCheckboxWidgetSchema, SFComponent, SFNumberWidgetSchema, SFSchema, @@ -13,7 +11,6 @@ import { SFTextareaWidgetSchema, SFUISchema } from '@delon/form'; -import { SettingsService, _HttpClient } from '@delon/theme'; import { EACacheService, ShipperBaseService } from '@shared'; import format from 'date-fns/format'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -54,13 +51,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { shipperName = ''; patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`; constructor( - private http: _HttpClient, fb: FormBuilder, private modalService: NzModalService, - private settingSrv: SettingsService, public service: SupplyManagementService, - private router: Router, - private route: ActivatedRoute, private eaCacheSrv: EACacheService, private amapService: AmapService, public shipperSrv: ShipperBaseService diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 9935181c..cfb99849 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/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 ) { diff --git a/src/app/routes/sys-setting/components/note-management/note-management.component.ts b/src/app/routes/sys-setting/components/note-management/note-management.component.ts index 2bc9b0c5..937eec29 100644 --- a/src/app/routes/sys-setting/components/note-management/note-management.component.ts +++ b/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 }); diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index f3c05aef..434f4f8d 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/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,7 @@ export class BillingOrderComponent extends BasicTableComponent { className: 'text-center', index: 'paymentMethodRate', width: 130, - format: record => `${record.paymentMethodRate*100}%` + format: record => `${record.paymentMethodRate * 100}%` }, { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' }, { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' }, diff --git a/src/app/routes/usercenter/components/driver/captain/captain.component.ts b/src/app/routes/usercenter/components/driver/captain/captain.component.ts index 247bdc96..a60aadf6 100644 --- a/src/app/routes/usercenter/components/driver/captain/captain.component.ts +++ b/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 { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; +import { Router } from '@angular/router'; +import { STColumn, STComponent, STData } from '@delon/abc/st'; +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; diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts index 70e36b6c..12e6f51a 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts +++ b/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'; diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts index 5a8d983d..c204d864 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts +++ b/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'; diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts index 9574f30a..38d9fd80 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts +++ b/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'; diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts index b517e581..7ae365b3 100644 --- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts @@ -1,14 +1,7 @@ -import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; -import { EAEnvironmentService, ShipperBaseService } from '@shared'; -import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; -import format from 'date-fns/format'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; 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') { - this.initDetailData() + if (this.sts == '2') { + this.initDetailData(); } this.initSF(); } initDetailData() { - const params = { id: this.i.id - } + }; this.service.request(this.service.$api_partnerChannelUpdateDetaiList, params).subscribe(res => { - if(res) { - this.detailData = res + if (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,30 @@ 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: 3 } - ], - }, + ] + } }, - required: ['channelId', 'remark', 'effectiveNode'], + required: ['channelId', 'remark', 'effectiveNode'] }; this.ui = { '*': { spanLabelFixed: 180, grid: { span: 18 }, - width: 600, + width: 600 } }; } @@ -138,27 +125,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; - if(this.sts == '1') { - enterId = this.rows + let enterId: any; + if (this.sts == '1') { + 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); } - }) + }); } } diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts index 1b1b174b..6c77f517 100644 --- a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts @@ -1,14 +1,7 @@ -import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; -import { EAEnvironmentService, ShipperBaseService } from '@shared'; -import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; -import format from 'date-fns/format'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; 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') { - this.initDetailData() - } + if (this.sts == '2') { + this.initDetailData(); + } this.initSF(); } initDetailData() { const params = { id: this.i.id - } + }; this.service.request(this.service.$api_partnerChannelUpdateDetaiList, params).subscribe(res => { - if(res) { - this.detailData = res + if (res) { + this.detailData = res; } else { - this.service.msgSrv.error(res.msg) + this.service.msgSrv.error(res.msg); } - }) + }); } initSF() { this.schema = { @@ -81,30 +68,30 @@ 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: 3 } - ], - }, + ] + } }, - required: ['channelId', 'remark', 'effectiveNode'], + required: ['channelId', 'remark', 'effectiveNode'] }; this.ui = { '*': { spanLabelFixed: 180, grid: { span: 18 }, - width: 600, + width: 600 } }; } @@ -112,31 +99,30 @@ export class EditSaleComponentsAddComponent implements OnInit { return {}; } save() { - let enterId : any; - if(this.sts == '1') { - enterId = this.rows + let enterId: any; + if (this.sts == '1') { + 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) { - this.service.msgSrv.success('修改成功') - this.modal.destroy(true) + if (res) { + this.service.msgSrv.success('修改成功'); + this.modal.destroy(true); } - }) + }); } }); } close(): void { - this.modal.close(true) + this.modal.close(true); } } diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts index c5a26054..3a6c26e1 100644 --- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts +++ b/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, diff --git a/src/app/routes/usercenter/components/freight/list/view/view.component.ts b/src/app/routes/usercenter/components/freight/list/view/view.component.ts index 0874ddda..9b518ea8 100644 --- a/src/app/routes/usercenter/components/freight/list/view/view.component.ts +++ b/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 { ModalHelper, _HttpClient } from '@delon/theme'; -import { NzMessageService } from 'ng-zorro-antd/message'; +import { STComponent } from '@delon/abc/st'; 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(); diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index 66707ca1..d38c31ae 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/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 { NzMessageService } from 'ng-zorro-antd/message'; +import { ModalHelper } from '@delon/theme'; 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 ) {} diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts index 9b8121a9..59dcb0ae 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts +++ b/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 diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts index fb2e7200..92ac6e35 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/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 ) {} diff --git a/src/app/shared/services/business/user.service.ts b/src/app/shared/services/business/user.service.ts index 82f6a790..7d7ccda5 100644 --- a/src/app/shared/services/business/user.service.ts +++ b/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 ) { From c4d0cb81b2edf9bc4deeb51eb151d69d05b7f502 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 11:23:46 +0800 Subject: [PATCH 16/18] fix bug --- .../partner-list/components/index/partner-list.component.html | 4 ++-- .../freight/list/editPartner/editPartner.component.ts | 3 +-- .../components/freight/list/editSale/editSale.component.ts | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html index cba079c7..7e290abc 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html +++ b/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:23:22 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -79,7 +79,7 @@ - + diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts index b517e581..b343f09c 100644 --- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts @@ -119,8 +119,7 @@ export class EditPartnerComponentsAddComponent implements OnInit { } as SFRadioWidgetSchema, enum: [ { label: '修改成功后立即生效', value: 1 }, - { label: 'CRM流程审核后生效', value: 2 }, - { label: 'CRM流程审核通过后生效', value: 3 } + // { label: 'CRM流程审核通过后生效', value: 2 }, ], }, }, diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts index 1b1b174b..f2caf0a9 100644 --- a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts @@ -93,8 +93,7 @@ export class EditSaleComponentsAddComponent implements OnInit { } as SFRadioWidgetSchema, enum: [ { label: '修改成功后立即生效', value: 1 }, - { label: 'CRM流程审核后生效', value: 2 }, - { label: 'CRM流程审核通过后生效', value: 3 } + // { label: 'CRM流程审核通过后生效', value: 2 }, ], }, }, From 63b4b034f8e97dfbcb415fe083746cfde371bc83 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 11:24:57 +0800 Subject: [PATCH 17/18] fix bug --- .../freight/list/editPartner/editPartner.component.ts | 7 ------- .../components/freight/list/editSale/editSale.component.ts | 7 ------- 2 files changed, 14 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts index a00e0e88..d0ebdf71 100644 --- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts @@ -106,16 +106,9 @@ export class EditPartnerComponentsAddComponent implements OnInit { } as SFRadioWidgetSchema, enum: [ { label: '修改成功后立即生效', value: 1 }, -<<<<<<< HEAD // { label: 'CRM流程审核通过后生效', value: 2 }, ], }, -======= - { label: 'CRM流程审核后生效', value: 2 }, - { label: 'CRM流程审核通过后生效', value: 3 } - ] - } ->>>>>>> ce53cdf83506568de0b8d5d43c83106c97e85545 }, required: ['channelId', 'remark', 'effectiveNode'] }; diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts index c87ae14f..0ce1ec43 100644 --- a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts @@ -80,16 +80,9 @@ export class EditSaleComponentsAddComponent implements OnInit { } as SFRadioWidgetSchema, enum: [ { label: '修改成功后立即生效', value: 1 }, -<<<<<<< HEAD // { label: 'CRM流程审核通过后生效', value: 2 }, ], }, -======= - { label: 'CRM流程审核后生效', value: 2 }, - { label: 'CRM流程审核通过后生效', value: 3 } - ] - } ->>>>>>> ce53cdf83506568de0b8d5d43c83106c97e85545 }, required: ['channelId', 'remark', 'effectiveNode'] }; From b6b51c9a662efd271b713242c077a04c199ed167 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 11:35:41 +0800 Subject: [PATCH 18/18] fix bug --- proxy.conf.js | 4 +- .../index/partner-list.component.html | 77 ++++++++++++++----- .../index/partner-list.component.ts | 2 +- 3 files changed, 59 insertions(+), 24 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 057e4e2c..7db07ae1 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 17:54:06 + * @LastEditTime : 2022-05-09 11:25:41 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html index 7e290abc..24522919 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html +++ b/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-09 11:23:22 + * @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 @@
    - +
    -
    +
    - + +
    - +
    - {{selectItem?.enterpriseName || selectItem?.contactName}} + {{ selectItem?.enterpriseName || selectItem?.contactName }} @@ -57,8 +81,8 @@
    - {{selectItem?.enterpriseName || selectItem?.contactName}} - {{selectItem?.channelIdLabel}} + {{ selectItem?.enterpriseName || selectItem?.contactName }} + {{ selectItem?.channelIdLabel }} @@ -68,12 +92,21 @@ -

    已选（{{selectedRows?.length}}）

    - +

    已选（{{ selectedRows?.length }}）

    +     @@ -84,5 +117,7 @@
    -

    客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客

    -     \ No newline at end of file +

    客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客

    + diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 427c6c58..62134560 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/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,