From 6dbd583f0518308f2e14cdd85dc2d72dd60720d5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 17:12:38 +0800 Subject: [PATCH] fix bug --- .../add-etp-partner.component.ts | 2 + .../add-personal-partner.component.ts | 61 ++++++++++--------- .../list/editPartner/editPartner.component.ts | 20 +++--- 3 files changed, 47 insertions(+), 36 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts index 359dba09..44b9acce 100644 --- a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts +++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts @@ -569,12 +569,14 @@ export class AddEtpPartnerComponent { cityCodesList: { type: 'string', title: '所属城市', + maxMultipleCount: 3, ui: { widget: 'tree-select', grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请选择城市(最多3个)', checkable: true, class: 'city-tree-select', + maxMultipleCount: 3, asyncData: () => this.getRegionDetailByCode('').pipe( map((res: any) => diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts index 9de158b2..a322db65 100644 --- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts +++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts @@ -299,9 +299,12 @@ export class AddPersonalPartnerComponent { _addressTitle: { title: '', type: 'string', ui: { widget: 'custom' } }, cityCodesList: { type: 'string', - title: '所属城市', + title: '所属城市7', + maxMultipleCount: 3, ui: { widget: 'tree-select', + maxMultipleCount: 3, + maxTagCount: 3, grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请选择城市(最多3个)', checkable: true, @@ -314,9 +317,9 @@ export class AddPersonalPartnerComponent { ) ), expandChange: ({ node }: { node: NzTreeNode }) => - this.getRegionDetailByCode(node.key).pipe( - map((res: any) => res.map((item: any) => ({ ...item, title: item.name, key: item.regionCode, isLeaf: true }))) - ) + this.getRegionDetailByCode(node.key).pipe( + map((res: any) => res.map((item: any) => ({ ...item, title: item.name, key: item.regionCode, isLeaf: true }))) + ) } as SFTreeSelectWidgetSchema }, // 渠道销售 @@ -340,30 +343,30 @@ export class AddPersonalPartnerComponent { } private setInfo(info: any) { - this.sf.setValue('/adminUserInfo/name', info?.name); - this.sf.setValue('/adminUserInfo/certificatePhotoFront', info?.certificatePhotoFront); - this.sf.setValue('/adminUserInfo/certificatePhotoFrontWatermark', [ - { - uid: -1, - name: '文件', - status: 'done', - url: info?.certificatePhotoFrontWatermark, - response: info?.certificatePhotoFrontWatermark - } - ]); - this.sf.setValue('/adminUserInfo/certificatePhotoBack', info?.certificatePhotoBack); - this.sf.setValue('/adminUserInfo/certificatePhotoBackWatermark', [ - { - uid: -1, - name: '文件', - status: 'done', - url: info?.certificatePhotoBackWatermark, - response: info?.certificatePhotoBackWatermark - } - ]); - this.sf.setValue('/adminUserInfo/certificateNumber', info?.certificateNumber); - this.sf.setValue('/adminUserInfo/validStartTime', info?.validStartTime); - this.sf.setValue('/adminUserInfo/validEndTime', info?.validEndTime ? info?.validEndTime: null); - this.sf.setValue('/adminUserInfo/_isLoingDate', info?.validEndTime ? false: true); + this.sf.setValue('/adminUserInfo/name', info?.name); + this.sf.setValue('/adminUserInfo/certificatePhotoFront', info?.certificatePhotoFront); + this.sf.setValue('/adminUserInfo/certificatePhotoFrontWatermark', [ + { + uid: -1, + name: '文件', + status: 'done', + url: info?.certificatePhotoFrontWatermark, + response: info?.certificatePhotoFrontWatermark + } + ]); + this.sf.setValue('/adminUserInfo/certificatePhotoBack', info?.certificatePhotoBack); + this.sf.setValue('/adminUserInfo/certificatePhotoBackWatermark', [ + { + uid: -1, + name: '文件', + status: 'done', + url: info?.certificatePhotoBackWatermark, + response: info?.certificatePhotoBackWatermark + } + ]); + this.sf.setValue('/adminUserInfo/certificateNumber', info?.certificateNumber); + this.sf.setValue('/adminUserInfo/validStartTime', info?.validStartTime); + this.sf.setValue('/adminUserInfo/validEndTime', info?.validEndTime ? info?.validEndTime : null); + this.sf.setValue('/adminUserInfo/_isLoingDate', info?.validEndTime ? false : true); } } 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 e1f914ef..0a06c989 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 @@ -3,7 +3,7 @@ import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/f import { ShipperBaseService } from '@shared'; import { NzMessageService } from 'ng-zorro-antd/message'; import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service'; -import { NzModalRef } from 'ng-zorro-antd/modal'; +import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; @Component({ selector: 'app-ad-components-partner', @@ -23,7 +23,8 @@ export class EditPartnerComponentsAddComponent implements OnInit { public msgSrv: NzMessageService, public service: UsermanageService, private modal: NzModalRef, - public shipperservice: ShipperBaseService + public shipperservice: ShipperBaseService, + public nzModalService: NzModalService ) {} ngOnInit(): void { @@ -139,12 +140,17 @@ export class EditPartnerComponentsAddComponent implements OnInit { enterpriceIds: enterId, settStartTime: this.sf?.value?.settStartTime + ' 00:00:00' }; - - this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => { - if (res) { - this.service.msgSrv.success('修改成功'); - this.modal.destroy(true); + this.nzModalService.warning({ + nzTitle: '确定提交吗？', + nzOnOk: () => { + this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('修改成功'); + this.modal.destroy(true); + } + }); } }); + } }