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 7d1cafb2..d970bbd7 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 @@ -398,6 +398,7 @@ export class PartnerListComponent { width: 150, type: 'badge', badge: { + 0: { text: '未发起', color: 'default' }, 10: { text: '待合伙人签约', color: 'default' }, 15: { text: '签约中', color: 'processing' }, 20: { text: '平台签约完成', color: 'success' }, @@ -411,9 +412,8 @@ export class PartnerListComponent { type: 'badge', badge: { 0: { text: '未发起', color: 'default' }, - 10: { text: '待审核', color: 'processing' }, - 20: { text: '审核通过', color: 'success' }, - 30: { text: '驳回', color: 'error' } + 10: { text: '审核失败', color: 'error' }, + 20: { text: '审核通过', color: 'success' } } }, { diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts index 9cf0a9fe..ab33519c 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts @@ -81,6 +81,13 @@ export class PersonalPartnerDetailComponent implements OnInit { ...new Set((this.detailData?.cityCodesList as any[]).map(city => city.provinceCode)) ]; } + if (this.detailData?.channelIdLabel) { + const channel = (this.detailData.channelIdLabel as string).split('/'); + Object.assign(this.detailData, { + channelName: channel[0], + channelMobile: channel[1] + }); + } } }); } @@ -285,7 +292,7 @@ export class PersonalPartnerDetailComponent implements OnInit { buttons: [ { text: '详情', - click: (item) => this.service.showChangeDetail(item.id) + click: item => this.service.showChangeDetail(item.id) } ] } diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts index d8ff45cb..afc5e4d0 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts @@ -123,7 +123,7 @@ export class InputInvoiceComponent implements OnInit { title: '发票类型', ui: { widget: 'dict-select', - params: { dictKey: 'refund:apply:status' }, + params: { dictKey: 'DictConstants.INVOICE_TYPE' }, placeholder: '请选择', visibleIf: { expand: (value: boolean) => value @@ -154,14 +154,19 @@ export class InputInvoiceComponent implements OnInit { sts: { type: 'string', title: '收票状态', + enum: [ + { value: '', label: '全部' }, + { value: 1, label: '是' }, + { value: 0, label: '否' } + ], ui: { - widget: 'dict-select', - params: { dictKey: 'refund:apply:status' }, + widget: 'select', placeholder: '请选择', visibleIf: { expand: (value: boolean) => value } - } + }, + default: '' }, invdate: { type: 'string', diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html index 2d05f3d4..b4501159 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html @@ -25,7 +25,7 @@ {{headerInfo?.vatinvHNum}} - {{headerInfo?.reciname}} + {{headerInfo?.reciname}}/{{headerInfo?.recitel}} {{headerInfo?.provinceName}}{{headerInfo?.cityName}}{{headerInfo?.areaName}}{{headerInfo?.reciaddr}}