diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index a942aff9..e235e937 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core'; * @Author : Shiming * @Date : 2022-01-05 11:01:55 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 10:45:19 + * @LastEditTime : 2022-04-25 10:28:10 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -96,8 +96,6 @@ export class ContractManagementTemplateTextComponent implements OnInit { { label: '运单合同', value: '3' }, { label: '运单补充协议', value: '4' }, { label: '委托代收合同', value: '5' }, - { label: '电子提货单', value: '10' }, - { label: '电子卸货单', value: '11' }, ]; this.sf.getProperty('/contractType')!.schema.enum = this.Types; this.sf.getProperty('/contractType')!.widget.reset(this.Types); @@ -178,7 +176,7 @@ export class ContractManagementTemplateTextComponent implements OnInit { } } }, - required: ['templateName', 'templateType'] + required: ['templateName', 'templateType','contractType'] }; this.ui = { '*': { diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.html b/src/app/routes/sys-setting/components/close-account/close-account.component.html index ac4baf2e..0dae990d 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.html +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.html @@ -16,7 +16,7 @@ - + edit
diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.ts b/src/app/routes/sys-setting/components/close-account/close-account.component.ts index 0826ae0c..1472bf4e 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts @@ -187,6 +187,10 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; console.log(res) if(res) { this.formData = res; + const List: any = []; + List.push({ label: res.enterpriseName, value: res.id }); + this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; + this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); } }) this.edit = true;