From 024a251cf879077e0b830c9dd90e48f4420d2dcd Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 1 Mar 2022 19:29:38 +0800 Subject: [PATCH 1/4] edit --- .../audit-admin/audit-admin.component.ts | 9 +++++---- .../enterprise-audit/enterprise-audit.component.ts | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.ts index 4c903b5e..39364f6f 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.ts +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.ts @@ -102,17 +102,18 @@ export class AuditAdminComponent implements OnInit { default: user.creditPhoto }, approvalOpinion: { - title: '备注', + title: this.isReadOnly ? '驳回原因' : '备注', type: 'string', maxLength: 100, ui: { placeholder: '审核不通过需要说明原因', - widget: 'textarea', + widget: this.i?.approvalStatus === 30 && this.isReadOnly ? 'text' : 'textarea', autosize: { minRows: 3, maxRows: 6 }, visibleIf: { - expand: (value: boolean) => !this.isReadOnly + expand: (value: boolean) => !this.isReadOnly || this.i?.approvalStatus === 30 } - } + }, + default: user.approvalOpinion } } }; 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 52c1e11a..c413e2ee 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 @@ -318,10 +318,10 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { return [ { title: '企业名称', className: 'text-center', index: 'enterpriseName' }, { title: '当前管理员', className: 'text-center', index: 'oldAdminName', width: 140 }, - { title: '当前管理员手机号', className: 'text-center', index: 'oldAdminMobile', width: 150 }, + { title: '当前管理员手机号', className: 'text-center', index: 'oldAdminMobile', width: 170 }, { title: '转授对象', className: 'text-center', index: 'newAdminName', width: 140 }, { title: '转授对象手机号', className: 'text-center', index: 'newAdminMobile', width: 150 }, - { title: '申请时间', className: 'text-center', index: 'createTime', width: 160 }, + { title: '申请时间', className: 'text-center', index: 'createTime', width: 170 }, { title: '状态', className: 'text-center', From dfda671a33eefc13b69a78ae9da45b43fac29468 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 1 Mar 2022 19:35:30 +0800 Subject: [PATCH 2/4] edit --- .../freight/freight-config/freight-config.component.html | 2 +- .../freight/freight-config/freight-config.component.ts | 6 ++---- src/app/routes/usercenter/services/usercenter.service.ts | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html index fdf3e863..8ae7a79e 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html @@ -21,7 +21,7 @@ class="text-right"> -