diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index 14dceaa9..50799075 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -39,10 +39,17 @@
- + {{ item.freightPrice | currency }} @@ -62,8 +69,7 @@
- - +
@@ -72,26 +78,21 @@
卸 | {{ item?.unloadingTime }}
-
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : ''}}{{ item?.carNo ? "/" + - item?.carNo : '' }}
+
{{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' + item?.carNo : '' }}
-
{{ item?.payeeName }}{{item?.payeePhone ? "/" + item?.payeePhone : '' }}
+
{{ item?.payeeName }}{{ item?.payeePhone ? '/' + item?.payeePhone : '' }}
- {{ - item.billCode }} - {{ - item.billCode }} - {{ - item.billCode }} + {{ item.billCode }} + {{ item.billCode }} + {{ item.billCode }}
- {{item?.billStatusLabel}} + {{ item?.billStatusLabel }}
- {{item?.resourceTypeLabel}}{{item?.serviceTypeLabel === item?.resourceTypeLabel ? - '':item?.serviceTypeLabel}} + {{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel === item?.resourceTypeLabel ? '' : item?.serviceTypeLabel }}
@@ -116,20 +117,18 @@
- + + 更多
    -
  • - 批量通过 -
  • -
  • - 批量生成电子单据 -
  • +
  • 批量通过
  • +
  • 批量生成电子单据
-
\ No newline at end of file +
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 24522919..fd1002df 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:33:34 + * @LastEditTime : 2022-05-09 14:40:09 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -61,6 +61,14 @@ [scroll]="{ x: '1200px' }" [page]="{}" > + +
+ {{item.partnerType ? item.enterpriseName || item.contactName : ''}} +
+
+ 管理员: {{item.contactName }} +
+
@@ -104,7 +112,6 @@ [req]="{ process: beforeReq, params: { effectiveStatus: 2, newPartnerId: selectItem.id } }" [loading]="service.http.loading" [page]="{ show: false }" - (change)="stChange($event)" > 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 62134560..ae23d1e2 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 @@ -412,13 +412,11 @@ export class PartnerListComponent { return [ { title: '合伙人名称', - index: 'enterpriseName', + render: 'enterpriseName', width: 180, - format: item => (item.partnerType ? `${item.enterpriseName || item.contactName}` : '') }, { title: '付款编码', index: 'payCode', width: 160 }, { title: '邀请码', index: 'invitationCode', className: 'text-center', width: 130 }, - { title: '企业管理员', index: 'contactName', width: 150, format: item => (item.partnerType ? `${item.contactName}` : '') }, { title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 }, { title: '类型', index: 'partnerType', className: 'text-center', width: 130, type: 'enum', enum: { 1: '企业', 2: '个人' } }, { title: '注册渠道', index: 'source', type: 'enum', enum: { 1: '合伙人注册', 2: '平台添加' }, width: 130 },